Snap for 7500893 from 1d2aba676079502386b61712288a2ba2d2771347 to sc-mainline-release

Change-Id: I977155c6c05789a3e858276d8137b3d4a24f3d64
diff --git a/Android.bp b/Android.bp
index 9e79511..eb12ad3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,7 +73,7 @@
 
 android_library_import {
     name: "play-services-basement-aar",
-    aars: ["libs/play-services-basement-17.5.0.aar"],
+    aars: ["libs/play-services-basement-17.0.0.aar"],
     sdk_version: "system_current",
 }
 
@@ -85,13 +85,13 @@
 
 android_library_import {
     name: "play-services-tasks-aar",
-    aars: ["libs/play-services-tasks-17.2.0.aar"],
+    aars: ["libs/play-services-tasks-17.0.0.aar"],
     sdk_version: "system_current",
 }
 
 android_library_import {
     name: "transport-api-aar",
-    aars: ["libs/transport-api-2.2.1.aar"],
+    aars: ["libs/transport-api-2.2.0.aar"],
     sdk_version: "system_current",
 }
 
@@ -100,3 +100,39 @@
     jars: ["libs/firebase-encoders-16.1.0.jar"],
     sdk_version: "system_current",
 }
+
+android_library_import {
+    name: "firebase-measurement-connector-aar",
+    aars: ["libs/firebase-measurement-connector-18.0.0.aar"],
+    sdk_version: "system_current",
+}
+
+android_library_import {
+    name: "firebase-encoders-json-aar",
+    aars: ["libs/firebase-encoders-json-17.1.0.aar"],
+    sdk_version: "system_current",
+}
+
+android_library_import {
+    name: "firebase-datatransport-aar",
+    aars: ["libs/firebase-datatransport-17.0.10.aar"],
+    sdk_version: "system_current",
+}
+
+android_library_import {
+    name: "play-services-stats-aar",
+    aars: ["libs/play-services-stats-17.0.0.aar"],
+    sdk_version: "system_current",
+}
+
+android_library_import {
+    name: "transport-runtime-aar",
+    aars: ["libs/transport-runtime-2.2.0.aar"],
+    sdk_version: "system_current",
+}
+
+android_library_import {
+    name: "transport-backend-cct-aar",
+    aars: ["libs/transport-backend-cct-2.3.3.aar"],
+    sdk_version: "system_current",
+}
diff --git a/METADATA b/METADATA
index 58b2aa8..6fa3f19 100644
--- a/METADATA
+++ b/METADATA
@@ -15,10 +15,18 @@
   }
   url {
     type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=firebase-datatransport#com.google.firebase:firebase-datatransport:17.0.10"
+  }
+  url {
+    type: ARCHIVE
     value: "https://maven.google.com/web/index.html?q=firebase-encoders#com.google.firebase:firebase-encoders:16.1.0"
   }
   url {
     type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=firebase-encoders-json#com.google.firebase:firebase-encoders-json:17.1.0"
+  }
+  url {
+    type: ARCHIVE
     value: "https://maven.google.com/web/index.html?q=firebase-iid#com.google.firebase:firebase-iid:21.0.1"
   }
   url {
@@ -35,11 +43,15 @@
   }
   url {
     type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=firebase-measurement-connector#com.google.firebase:firebase-measurement-connector:18.0.0"
+  }
+  url {
+    type: ARCHIVE
     value: "https://maven.google.com/web/index.html?q=firebase-messaging#com.google.firebase:firebase-messaging:21.0.1"
   }
   url {
     type: ARCHIVE
-    value: "https://maven.google.com/web/index.html?q=play-services-basement#com.google.android.gms:play-services-basement:17.5.0"
+    value: "https://maven.google.com/web/index.html?q=play-services-basement#com.google.android.gms:play-services-basement:17.0.0"
   }
   url {
     type: ARCHIVE
@@ -47,16 +59,28 @@
   }
   url {
     type: ARCHIVE
-    value: "https://maven.google.com/web/index.html?q=play-services-tasks#com.google.android.gms:play-services-tasks:17.2.0"
+    value: "https://maven.google.com/web/index.html?q=play-services-stats#com.google.android.gms:play-services-stats:17.0.0"
   }
   url {
     type: ARCHIVE
-    value: "https://maven.google.com/web/index.html?q=transport-api#com.google.android.datatransport:transport-api:2.2.1"
+    value: "https://maven.google.com/web/index.html?q=play-services-tasks#com.google.android.gms:play-services-tasks:17.0.0"
+  }
+  url {
+    type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=transport-api#com.google.android.datatransport:transport-api:2.2.0"
+  }
+  url {
+    type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=transport-backend-cct#com.google.android.datatransport:transport-backend-cct:2.3.3"
+  }
+  url {
+    type: ARCHIVE
+    value: "https://maven.google.com/web/index.html?q=transport-runtime#com.google.android.datatransport:transport-runtime:2.2.0"
   }
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 2
-    day: 20
+    month: 6
+    day: 28
   }
 }
diff --git a/libs/firebase-datatransport-17.0.10.aar b/libs/firebase-datatransport-17.0.10.aar
new file mode 100644
index 0000000..acbae17
--- /dev/null
+++ b/libs/firebase-datatransport-17.0.10.aar
Binary files differ
diff --git a/libs/firebase-encoders-json-17.1.0.aar b/libs/firebase-encoders-json-17.1.0.aar
new file mode 100644
index 0000000..4d1a7e8
--- /dev/null
+++ b/libs/firebase-encoders-json-17.1.0.aar
Binary files differ
diff --git a/libs/firebase-measurement-connector-18.0.0.aar b/libs/firebase-measurement-connector-18.0.0.aar
new file mode 100644
index 0000000..f94e3d1
--- /dev/null
+++ b/libs/firebase-measurement-connector-18.0.0.aar
Binary files differ
diff --git a/libs/play-services-basement-17.0.0.aar b/libs/play-services-basement-17.0.0.aar
new file mode 100644
index 0000000..9c4ec2a
--- /dev/null
+++ b/libs/play-services-basement-17.0.0.aar
Binary files differ
diff --git a/libs/play-services-basement-17.5.0.aar b/libs/play-services-basement-17.5.0.aar
deleted file mode 100644
index e563e7d..0000000
--- a/libs/play-services-basement-17.5.0.aar
+++ /dev/null
Binary files differ
diff --git a/libs/play-services-stats-17.0.0.aar b/libs/play-services-stats-17.0.0.aar
new file mode 100644
index 0000000..a501b9e
--- /dev/null
+++ b/libs/play-services-stats-17.0.0.aar
Binary files differ
diff --git a/libs/play-services-tasks-17.0.0.aar b/libs/play-services-tasks-17.0.0.aar
new file mode 100644
index 0000000..c58fbfb
--- /dev/null
+++ b/libs/play-services-tasks-17.0.0.aar
Binary files differ
diff --git a/libs/play-services-tasks-17.2.0.aar b/libs/play-services-tasks-17.2.0.aar
deleted file mode 100644
index 637148c..0000000
--- a/libs/play-services-tasks-17.2.0.aar
+++ /dev/null
Binary files differ
diff --git a/libs/transport-api-2.2.0.aar b/libs/transport-api-2.2.0.aar
new file mode 100644
index 0000000..6d24b7f
--- /dev/null
+++ b/libs/transport-api-2.2.0.aar
Binary files differ
diff --git a/libs/transport-api-2.2.1.aar b/libs/transport-api-2.2.1.aar
deleted file mode 100644
index e14a5e4..0000000
--- a/libs/transport-api-2.2.1.aar
+++ /dev/null
Binary files differ
diff --git a/libs/transport-backend-cct-2.3.3.aar b/libs/transport-backend-cct-2.3.3.aar
new file mode 100644
index 0000000..51a6e2b
--- /dev/null
+++ b/libs/transport-backend-cct-2.3.3.aar
Binary files differ
diff --git a/libs/transport-runtime-2.2.0.aar b/libs/transport-runtime-2.2.0.aar
new file mode 100644
index 0000000..9a9ca81
--- /dev/null
+++ b/libs/transport-runtime-2.2.0.aar
Binary files differ