Merge branch 'main' into dconeybe/dataconnect/Emulator_2_15_1

Author: dconeybe

firebase-perf/e2e-app/e2e-app.gradle

@@ -86,7 +86,7 @@ dependencies {
 
     // Google Deps
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
-    implementation "com.google.guava:guava:30.1.1-android"
+    implementation "com.google.guava:guava:31.0.1-android"
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.recyclerview:recyclerview:1.1.0"