diff --git a/app/build.gradle b/app/build.gradle
index 291ffccc4b..6d92f575c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,8 +229,8 @@ android {
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
+        resourceConfigurations += []
 
-        resConfigs autoResConfig()
 
         splits {
             abi {
diff --git a/build.gradle b/build.gradle
index 0c1d676309..45f3e2b88a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/dependencies.gradle b/dependencies.gradle
index 2544de1863..f2a3f159ab 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             version('kotlin', '1.8.10')
             version('libsignal-client', '0.26.0')
             version('mp4parser', '1.9.39')
-            version('android-gradle-plugin', '7.4.1')
+            version('android-gradle-plugin', '8.0.2')
             version('accompanist', '0.28.0')
 
             // Android Plugins
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 61fdf583be..0ef7920121 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -725,22 +725,27 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9fa21e2030273ee3cb8c4701c341af8cf9359791a3b45b2bc0be07870c03b1c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="databinding-common" version="8.0.2">
+         <artifact name="databinding-common-8.0.2.jar">
+            <sha256 value="9fa21e2030273ee3cb8c4701c341af8cf9359791a3b45b2bc0be07870c03b1c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.databinding" name="databinding-compiler-common" version="7.4.1">
          <artifact name="databinding-compiler-common-7.4.1.jar">
             <sha256 value="b9e4baee6a891856c92c53adbd30e7ff1a7fdbaf1a4a0bd87321798abc53056f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="8.0.0">
-         <artifact name="databinding-compiler-common-8.0.0.jar">
-            <sha256 value="0ba3fe2768b967a50554312c84cbeda9c6525b4883bb91dca38a439c12953953" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.0.2">
+         <artifact name="databinding-compiler-common-8.0.2.jar">
+            <sha256 value="7b5cf583171d30a3fff4a0230b620a601e4b0a9d2de05d66bebf678229740caf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="viewbinding" version="8.0.0">
-         <artifact name="viewbinding-8.0.0.aar">
-            <sha256 value="2425d869bc92a5dee70ae3dc44fce8707f42ea61c227063289f4091e6f98696b" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="viewbinding" version="8.0.2">
+         <artifact name="viewbinding-8.0.2.aar">
+            <sha256 value="995d561aa5b45401ab6a10e886e53dbd7d813fdfb0d3e170024a4c6260531d80" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="viewbinding-8.0.0.module">
-            <sha256 value="b1f8c06e43e7cdc032b2ffa88fe71fdf19f759744b17173558e6ed762f4ff03d" origin="Generated by Gradle"/>
+         <artifact name="viewbinding-8.0.2.module">
+            <sha256 value="2c36c3fb570d1825e87bf90567d67a8445cbe1055400ef4eb8c969f6cf04d6a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.documentfile" name="documentfile" version="1.0.0">
@@ -1509,33 +1514,18 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="7.4.1">
-         <artifact name="signflinger-7.4.1.jar">
+      <component group="com.android" name="signflinger" version="8.0.2">
+         <artifact name="signflinger-8.0.2.jar">
             <sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="8.0.0">
-         <artifact name="signflinger-8.0.0.jar">
-            <sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android" name="zipflinger" version="7.4.1">
-         <artifact name="zipflinger-7.4.1.jar">
+      <component group="com.android" name="zipflinger" version="8.0.2">
+         <artifact name="zipflinger-8.0.2.jar">
             <sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="8.0.0">
-         <artifact name="zipflinger-8.0.0.jar">
-            <sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.databinding" name="baseLibrary" version="7.4.1">
-         <artifact name="baseLibrary-7.4.1.jar">
-            <sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.databinding" name="baseLibrary" version="8.0.0">
-         <artifact name="baseLibrary-8.0.0.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="8.0.2">
+         <artifact name="baseLibrary-8.0.2.jar">
             <sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1549,8 +1539,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="31.0.0">
-         <artifact name="annotations-31.0.0.jar">
+      <component group="com.android.tools" name="annotations" version="31.0.2">
+         <artifact name="annotations-31.0.2.jar">
             <sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1564,9 +1554,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ff1bc07e6f7c98995e27d76dcc26604a5c6e5aaf5f8f6602fee982ad9a4d064c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="31.0.0">
-         <artifact name="common-31.0.0.jar">
-            <sha256 value="a39ee18a435a5061d324040e18af3f633a447933780b57da91efaccd946ee3a2" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="common" version="31.0.2">
+         <artifact name="common-31.0.2.jar">
+            <sha256 value="09f1b19445cc1307e3d065c0f9fde4779abc5100b351eca2b0361c6dc9930d8d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools" name="desugar_jdk_libs" version="1.1.5">
@@ -1589,8 +1579,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d946ad39a40b667c82da87724527815536de62d0db0e8ea333449fdb90509001" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="31.0.0">
-         <artifact name="dvlib-31.0.0.jar">
+      <component group="com.android.tools" name="dvlib" version="31.0.2">
+         <artifact name="dvlib-31.0.2.jar">
             <sha256 value="d946ad39a40b667c82da87724527815536de62d0db0e8ea333449fdb90509001" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1599,6 +1589,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="270f0f4653fe0d6477e55359dd47fb61ec5c96597997871e916b405042b39b91" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.0.2">
+         <artifact name="play-sdk-proto-31.0.2.jar">
+            <sha256 value="270f0f4653fe0d6477e55359dd47fb61ec5c96597997871e916b405042b39b91" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="repository" version="30.2.2">
          <artifact name="repository-30.2.2.jar">
             <sha256 value="90bbccdd17c95d0cb66771102d750f159b03f8bb36d8ddef99cdd1e03864b1c6" origin="Generated by Gradle"/>
@@ -1609,8 +1604,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6c39549d1887a2c7e08b73d66c0c4f103657b06471760fb65858c943756cc940" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="31.0.0">
-         <artifact name="repository-31.0.0.jar">
+      <component group="com.android.tools" name="repository" version="31.0.2">
+         <artifact name="repository-31.0.2.jar">
             <sha256 value="c11d10822af862cee3412ddc7245f6054d4b00a9e61fd1d2357390280879ea36" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1624,8 +1619,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3c5517b9a65fd33c2a1caeab787306d4e3bb233713e7bb47bacddcd84db2ea0d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="31.0.0">
-         <artifact name="sdk-common-31.0.0.jar">
+      <component group="com.android.tools" name="sdk-common" version="31.0.2">
+         <artifact name="sdk-common-31.0.2.jar">
             <sha256 value="766aa3b48b8c87adb8a1b0fed6689d48ec85ea803f85ab9f155c0e40c510e258" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1639,18 +1634,13 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8778613653c57b429abef58b67f3ef0be16a0b018f8ea442298d78394f422a5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="31.0.0">
-         <artifact name="sdklib-31.0.0.jar">
+      <component group="com.android.tools" name="sdklib" version="31.0.2">
+         <artifact name="sdklib-31.0.2.jar">
             <sha256 value="9770b9aaedcb5543497b9abb79ac0e1ee5ba3a8197969b52aa51a06f6bc10964" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="30.4.1">
-         <artifact name="crash-30.4.1.jar">
-            <sha256 value="aa05293ff6efca0f1687cfaa2deb201984016320b8bd3636a7e51abbf90f2c5d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="31.0.0">
-         <artifact name="crash-31.0.0.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="31.0.2">
+         <artifact name="crash-31.0.2.jar">
             <sha256 value="1a940620fcd33f546200defd5347be74f7341c08563fc52a0eeeb4b8ccdd0c51" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1659,13 +1649,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="feb293a4d175a24ce7f98d7f783670d81dab61260cf9bbd3d748e94f95e38892" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="30.4.1">
-         <artifact name="protos-30.4.1.jar">
-            <sha256 value="ba0303b9592dcd3891b616063f3eb670485f1a0fd5ad212d92ded505843ea87c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="31.0.0">
-         <artifact name="protos-31.0.0.jar">
+      <component group="com.android.tools.analytics-library" name="protos" version="31.0.2">
+         <artifact name="protos-31.0.2.jar">
             <sha256 value="d074b93c2395722c6fff42b0397c5ba6cb2be44338a49a5133fbfb9b8191a68d" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1674,13 +1659,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2512bf78dc8969b0206841ce996369b5a72d490c42e5c8410c3a62b455b0929b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="30.4.1">
-         <artifact name="shared-30.4.1.jar">
-            <sha256 value="556ebcfec60be225254d03d19a7d75b707fdc45f71b440f68f48d640a59305d4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="31.0.0">
-         <artifact name="shared-31.0.0.jar">
+      <component group="com.android.tools.analytics-library" name="shared" version="31.0.2">
+         <artifact name="shared-31.0.2.jar">
             <sha256 value="d7efd1542cf705b1a0a46ac493849f7cf3d5e4b3bcdc78a4fa0478ea6c7caccb" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1689,13 +1669,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3a961cd6b0c9445b47c18d0516b534bdf094f93151197896f480f8798697c729" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="30.4.1">
-         <artifact name="tracker-30.4.1.jar">
-            <sha256 value="a62bcf8ad3816bdc276999e80c8edd52bdb1a20bfd571d8f5f7e91fce1c74545" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="31.0.0">
-         <artifact name="tracker-31.0.0.jar">
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.0.2">
+         <artifact name="tracker-31.0.2.jar">
             <sha256 value="a62bcf8ad3816bdc276999e80c8edd52bdb1a20bfd571d8f5f7e91fce1c74545" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1710,6 +1685,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="020ec9c8c464785b9ca52b848b5a12cc7f0fea9c6879b4b1d335404c9a8ef652" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2" version="8.0.2-9289358">
+         <artifact name="aapt2-8.0.2-9289358-linux.jar">
+            <sha256 value="e18c5ff5e71e3e9fcf6b6ad021c7013538f31066e253e3b4816fccf105f3a364" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.0.0-beta04-7396180">
          <artifact name="aapt2-proto-7.0.0-beta04-7396180.jar">
             <sha256 value="1ca4f1b0f550c6c25f63c1916da84f6e7a92c66b7ad38ab1d5d49a20552a5984" origin="Generated by Gradle"/>
@@ -1718,72 +1698,38 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="22b5d69296c06b99261c2b5485994af1e6e7e02beb6a8d213ce88dae76660755" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="7.4.1-8841542">
-         <artifact name="aapt2-proto-7.4.1-8841542.jar">
-            <sha256 value="4c880287ca1b83e741ac141b8b71877f3909efe88f9de33e68112dd12921032a" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.0.2-9289358">
+         <artifact name="aapt2-proto-8.0.2-9289358.jar">
+            <sha256 value="b7dc57505b56d06ab057bcc5360ca7cb995e61c2633ddaa17c0638b17913aaae" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-7.4.1-8841542.module">
-            <sha256 value="8f928b0a2e36c8b084c349258cfbbc75cf9a26ea03450b3eea6cec856e69813d" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-8.0.2-9289358.module">
+            <sha256 value="53a68846734600d0988d744600dbf93298b95662de996591330327de97c20168" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="8.0.0-9289358">
-         <artifact name="aapt2-proto-8.0.0-9289358.jar">
-            <sha256 value="1fee8cb58a6a8a884d87322d62358149be0a4f415a77608533f9ff32f421af35" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.0.2">
+         <artifact name="aaptcompiler-8.0.2.jar">
+            <sha256 value="1006750a1bbdf22db39b480a8c10ee2f982d0395cbefbc83812aeaf9593b6567" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-8.0.0-9289358.module">
-            <sha256 value="84f32051d2cc34dfba2311e9cccdd37e189ae9567bd14c1962e2c674622fdac3" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-8.0.2.module">
+            <sha256 value="77372cb582dde1d3a4115ad8ab79166b78c52c270e2f6543b449d13e36012c0e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="7.4.1">
-         <artifact name="aaptcompiler-7.4.1.jar">
-            <sha256 value="22543444f6620de8b6ae7d4106de4deaf8d87533a2e920031e53417a4b2ff119" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aaptcompiler-7.4.1.module">
-            <sha256 value="7bbe39f755b5e2850214ebb8201bedef953b6a5a6c5a9805363ee955ee9da258" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="8.0.0">
-         <artifact name="aaptcompiler-8.0.0.jar">
-            <sha256 value="1beed0bd0ef7398ae89603b99ef7ce6cfe08db2ad21ca3b198141030a059cbe9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aaptcompiler-8.0.0.module">
-            <sha256 value="6300bb288613033d57dcfaab4fc3f9d4774c90bc6a4cb6ead7143fa4408bfa16" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="apksig" version="7.4.1">
-         <artifact name="apksig-7.4.1.jar">
-            <sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="apksig" version="8.0.0">
-         <artifact name="apksig-8.0.0.jar">
+      <component group="com.android.tools.build" name="apksig" version="8.0.2">
+         <artifact name="apksig-8.0.2.jar">
             <sha256 value="1556367f117415b3fbb66b3222254197b0f4aafdbc9f467497304409f0d30386" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="7.4.1">
-         <artifact name="apkzlib-7.4.1.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="8.0.2">
+         <artifact name="apkzlib-8.0.2.jar">
             <sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="8.0.0">
-         <artifact name="apkzlib-8.0.0.jar">
-            <sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder" version="8.0.2">
+         <artifact name="builder-8.0.2.jar">
+            <sha256 value="779804f5b8bd22c4f3fe69866e17cfc0f58f9ed3c4e02b9626b42bf66551140c" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder" version="7.4.1">
-         <artifact name="builder-7.4.1.jar">
-            <sha256 value="d0017cc9409f4745dfe704a8a2fbb7bea3aaf499718817e3ebe6515f84b1990b" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-7.4.1.module">
-            <sha256 value="32826f8c45f806740ffa69ef7c67e6ca4c36ef847f3fcb1019b0082960a4bc14" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder" version="8.0.0">
-         <artifact name="builder-8.0.0.jar">
-            <sha256 value="d892991279f1cc14b1cdf29ea9f688354608ce52e6269a1e87a345f1d6b0feb6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-8.0.0.module">
-            <sha256 value="50d0612337f19d96df91677fde9f5c048fffe54ca0179703de2fe797e0147572" origin="Generated by Gradle"/>
+         <artifact name="builder-8.0.2.module">
+            <sha256 value="720d811feecb2a20e592525e7b38963e39df76c083d355ab55730504d0dc46ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="builder-model" version="7.2.2">
@@ -1794,36 +1740,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b75e23136a6c751d459adc85966b56b7fb568aa3b4e7c86bd11e09ebd93549af" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="7.4.1">
-         <artifact name="builder-model-7.4.1.jar">
-            <sha256 value="f4f6f37c73c3a3cfa11a324eccb52056de1a19e89b9d5e7c59ef3dbd9bf49f13" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-model" version="8.0.2">
+         <artifact name="builder-model-8.0.2.jar">
+            <sha256 value="cbaa1696178cf3627840faaffe30c62e709e101bc15809a02783e45dfab815a0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-7.4.1.module">
-            <sha256 value="c3462caeb751c27ba30e682c670c45292a257cf3c36775f5f5f75320cf01ee3d" origin="Generated by Gradle"/>
+         <artifact name="builder-model-8.0.2.module">
+            <sha256 value="41c689f58e7a48ade2132219dda503a7b32e9767c912f07c8ac5c68d153cb4e3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="8.0.0">
-         <artifact name="builder-model-8.0.0.jar">
-            <sha256 value="009e56d1ef37cc43c60f903f35a8ff9700e548e4a62ab6be73adf0ef9768a53c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.0.2">
+         <artifact name="builder-test-api-8.0.2.jar">
+            <sha256 value="66f7798525a8eb5cd85dd905ce9a6de737a1d2363dee4155babd5e388e96d4f7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-8.0.0.module">
-            <sha256 value="9be644245063f94eda17cb97aa2a3e8421727398dd1be62375efa7cb71d91961" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="7.4.1">
-         <artifact name="builder-test-api-7.4.1.jar">
-            <sha256 value="00af4e97750607defc045345ef5bd207c6879b92b59ab422b32d3e2d5386c5e1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-test-api-7.4.1.module">
-            <sha256 value="2373380bbaa67a9aa73ff8e7dc07cda8e2e26636c10b584bf235812f2e7a40e9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="8.0.0">
-         <artifact name="builder-test-api-8.0.0.jar">
-            <sha256 value="9c649b120397057e3bef14fd018dd79b786840d7afed6055de8013e470edca8f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-test-api-8.0.0.module">
-            <sha256 value="02250d1a8c9ac968d92e0ada83b39745f672fc8fc046cadc416de373546c915b" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-8.0.2.module">
+            <sha256 value="acf833bb07ff61db0dc47151eb89236d93f25a75d6bf55958c9c57c36abb8c19" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="bundletool" version="1.11.4">
@@ -1836,52 +1766,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e56e54b7657f67e77c7550bec64f70d0de2780a4795024b99fcf6a701bd1718d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="7.4.1">
-         <artifact name="gradle-7.4.1.jar">
-            <sha256 value="893c816bfd6c82ac08e45c65491ba3f307ee2e26d09628b6af730b6d9cf4e555" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle" version="8.0.2">
+         <artifact name="gradle-8.0.2.jar">
+            <sha256 value="645916554831d28eb1dec154910c3e24ed4a077e03949c41d2ab4d47a623c9b6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-7.4.1.module">
-            <sha256 value="58d1eeed98e23e144c3ceed6a8ad83fa87ad8f671457fa2f1b8c353a4e051b40" origin="Generated by Gradle"/>
+         <artifact name="gradle-8.0.2.module">
+            <sha256 value="95a5a36f446bbfb4d6f290c98a8c9da9f2ab71c59290ada87617c07f4cda1164" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="8.0.0">
-         <artifact name="gradle-8.0.0.jar">
-            <sha256 value="98dc6d90bfe54aa27ac0921265b8a4d784bebed8e398a85bbe488cb22a51868d" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-api" version="8.0.2">
+         <artifact name="gradle-api-8.0.2.jar">
+            <sha256 value="e3a14c889d8e6b3e1c026015950db54a4d1bd09ade82e05307adba603f46f036" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-8.0.0.module">
-            <sha256 value="211b47bda2251bf2490ed87d7318c516ec434d99a4fc159b73ba87be738cde6d" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-8.0.2.module">
+            <sha256 value="c6aa577911ca61680a34e5e0612011f1cb823e5193e72cff92ce3b9aa8597668" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="7.4.1">
-         <artifact name="gradle-api-7.4.1.jar">
-            <sha256 value="7ff6e212ade19490b5a7a3271de7ff26a11cd4ffba02444641666bf8e55d955b" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.0.2">
+         <artifact name="gradle-settings-api-8.0.2.jar">
+            <sha256 value="1eeadff69357705c9289e0a7253c95f9e499f543ff853e413d49652ae13e1d8a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-7.4.1.module">
-            <sha256 value="402921f24c9c2f51ae80fa3e26b326cb2037843ae0de9571ff47e3191848f0da" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle-api" version="8.0.0">
-         <artifact name="gradle-api-8.0.0.jar">
-            <sha256 value="3179f8ea0fceba7d19f6f99518bcd78a331c70370674b7dd671e456e43645778" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-api-8.0.0.module">
-            <sha256 value="923ae69aad8e7e5f1c33f326c129df03a84744c6bd0fb23ba401f29e9dbd0893" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="7.4.1">
-         <artifact name="gradle-settings-api-7.4.1.jar">
-            <sha256 value="3f4d99f54e0f0af7c30065c8a2ba2f8fce8734b336f7149ad539f1e1e42d600e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-settings-api-7.4.1.module">
-            <sha256 value="6b392b991775b2e7cb9f916bb71839d282cd29f372fb10832b777b41ea7f760c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="8.0.0">
-         <artifact name="gradle-settings-api-8.0.0.jar">
-            <sha256 value="156a9173682632202e4246a4aab9c9fa56776a5849f944efd0cf4006abb4deb1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-settings-api-8.0.0.module">
-            <sha256 value="301ef54c0f17f94b6c8e31284ded8b00b5b77b62f5f6d780ce811301c83f2b63" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-8.0.2.module">
+            <sha256 value="038db3ffd98a091a3f3cce0de61ace5d003ee3ade5c903e0c41268e81c2b8213" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="manifest-merger" version="30.2.2">
@@ -1892,20 +1798,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6e3d541671c1e72dd052e1c280e27822c7fd875148b14e44cc3c67d14168dc99" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="30.4.1">
-         <artifact name="manifest-merger-30.4.1.jar">
-            <sha256 value="303191a7421a7426bc8925c47a8d515d29042d43d25eeb67ce07055e5136a087" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.0.2">
+         <artifact name="manifest-merger-31.0.2.jar">
+            <sha256 value="8a354d36df3e22d0df567645bc6430d95579919bf36055e945702f1c3c0c8ae2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-30.4.1.module">
-            <sha256 value="88b5a974fdf25eca50861be3235c478f84401541f844f06a23dc61fc20f5f959" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="31.0.0">
-         <artifact name="manifest-merger-31.0.0.jar">
-            <sha256 value="e1feb9f8c9b98dfa6eb073f068588d268a946d3c86e4dcf8bfd1a957891f2db6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="manifest-merger-31.0.0.module">
-            <sha256 value="074b44cd7aeaca7cd89de4c38e439c2028b1836934ec7da07719f7248dd60499" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-31.0.2.module">
+            <sha256 value="344ee2fc68a62b42b548a97900c2148cb8185b532ffe5d38a202903c22684bd1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
@@ -1934,21 +1832,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="875b9903278121307298476dcfb2f9961323410dd1cddb9370e5a755d06093d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="30.4.1">
-         <artifact name="ddmlib-30.4.1.jar">
-            <sha256 value="7157fafd4932de9e78737972cbd55eade7ba15e85fe3f522ca939af74b5cc489" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="31.0.0">
-         <artifact name="ddmlib-31.0.0.jar">
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.0.2">
+         <artifact name="ddmlib-31.0.2.jar">
             <sha256 value="66de3038ddc4f240a2b3331bc9863b379c3999a1a8b0923dc731f11a9a295034" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.emulator" name="proto" version="31.0.0">
-         <artifact name="proto-31.0.0.jar">
-            <sha256 value="03c9f2a9eb08ebad38da2352e82e5ab08fa4fac7083fe771942aa29f60ab5bab" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.2.2">
          <artifact name="intellij-core-30.2.2.jar">
             <sha256 value="cdec995f5c1a8839b996188fa8e0212b303021a48d4eed9659fcb5a7df92a364" origin="Generated by Gradle"/>
@@ -1959,6 +1847,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2d258f6137c7585608ea43320cfa0a685d32a40e6dd4cd0c21f466e60fd01ace" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.0.2">
+         <artifact name="intellij-core-31.0.2.jar">
+            <sha256 value="2d258f6137c7585608ea43320cfa0a685d32a40e6dd4cd0c21f466e60fd01ace" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.2.2">
          <artifact name="kotlin-compiler-30.2.2.jar">
             <sha256 value="77e23191adbc7d3235ca69540271edb31f30a9bc9a1e6a6ef255d1a577a595ce" origin="Generated by Gradle"/>
@@ -1969,6 +1862,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1b1ff8dca59b78e59aaa02818e1aef4aa142302fdfa7fb9041ca0c342da0bbe3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.0.2">
+         <artifact name="kotlin-compiler-31.0.2.jar">
+            <sha256 value="1b1ff8dca59b78e59aaa02818e1aef4aa142302fdfa7fb9041ca0c342da0bbe3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.2.2">
          <artifact name="uast-30.2.2.jar">
             <sha256 value="878f5b04ab3550074882b1698d58596a89fbe2b41e0fec0e0c3fd6aeb89b7900" origin="Generated by Gradle"/>
@@ -1979,18 +1877,18 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b4b1a74a712518c0dfd9930e9ffa69288ec84cf2fb55a5abd09f30b73ab0cac0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.0.2">
+         <artifact name="uast-31.0.2.jar">
+            <sha256 value="b4b1a74a712518c0dfd9930e9ffa69288ec84cf2fb55a5abd09f30b73ab0cac0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.2.2">
          <artifact name="layoutlib-api-30.2.2.jar">
             <sha256 value="2c7d7945ba2f8d4a482d8e8a5e906923350255fb8b275e5dc6fd0a4a6ee09ab7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.4.1">
-         <artifact name="layoutlib-api-30.4.1.jar">
-            <sha256 value="6b668eb1875462d558d5130061321b504385a69c4c1303036da4793768ed592b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.0.0">
-         <artifact name="layoutlib-api-31.0.0.jar">
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.0.2">
+         <artifact name="layoutlib-api-31.0.2.jar">
             <sha256 value="3df9c0423d26dffae97d9d622492c817dd57ac2d46b15e077b2af5fd9bf8ac05" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1999,8 +1897,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="31.0.0">
-         <artifact name="lint-31.0.0.jar">
+      <component group="com.android.tools.lint" name="lint" version="31.0.2">
+         <artifact name="lint-31.0.2.jar">
             <sha256 value="e2a2b4f88cf9977021161361c242a6ec8476eaba67fae00074fa0f2eb03252bc" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2009,9 +1907,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7c76cb21662660fa7ffe79afc44b59bf13ec2cf5e640d40e2c2d3e5a2b0cd4c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="31.0.0">
-         <artifact name="lint-api-31.0.0.jar">
-            <sha256 value="758d7c660e13be3693d3149a384637071bd5ec1809d121bccc25ce9a9fdcebd8" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-api" version="31.0.2">
+         <artifact name="lint-api-31.0.2.jar">
+            <sha256 value="b574c059dbe7c0bd5a8fb99b239e6ba844484a59c6622f2636c107eb87c3c24b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.lint" name="lint-checks" version="30.2.2">
@@ -2019,13 +1917,13 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c50975fed874d92d95e48123eb68251ce5155f8942f62ee6e772388464c2a4d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="31.0.0">
-         <artifact name="lint-checks-31.0.0.jar">
+      <component group="com.android.tools.lint" name="lint-checks" version="31.0.2">
+         <artifact name="lint-checks-31.0.2.jar">
             <sha256 value="67d210b6331030d27b11d7e081a9d299eb1d7a5519304de5a2c00fbb19044d42" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="31.0.0">
-         <artifact name="lint-gradle-31.0.0.jar">
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.0.2">
+         <artifact name="lint-gradle-31.0.2.jar">
             <sha256 value="0d34bcad5e346ebb6324ff8eee79d8fc418fa9a77892ffe17d48ea7677654a6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2034,13 +1932,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b7e988df12d6241e8f06f4d353790d01e268e955b2b7b35286d0fa5233e8a045" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="30.4.1">
-         <artifact name="lint-model-30.4.1.jar">
-            <sha256 value="315a24f47cc7b98d58c582e5e1bb490673301ecdf6b906d7170284c39f462c1b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-model" version="31.0.0">
-         <artifact name="lint-model-31.0.0.jar">
+      <component group="com.android.tools.lint" name="lint-model" version="31.0.2">
+         <artifact name="lint-model-31.0.2.jar">
             <sha256 value="162eb85f27efc7b11821f80bb9861a02bb979127beba9b265155c19c80f809ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2049,13 +1942,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="30.4.1">
-         <artifact name="lint-typedef-remover-30.4.1.jar">
-            <sha256 value="26c9384cd0cc727c0985097baf4fbcd90d556e06bb0f586c175ca9912fbc66ff" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.0.0">
-         <artifact name="lint-typedef-remover-31.0.0.jar">
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.0.2">
+         <artifact name="lint-typedef-remover-31.0.2.jar">
             <sha256 value="26c9384cd0cc727c0985097baf4fbcd90d556e06bb0f586c175ca9912fbc66ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2067,13 +1955,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e8aace773417569f1e0989d62b943891ff6e6eaf09f10ec7a5ef4fe91775bc0c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="30.4.1">
-         <artifact name="android-device-provider-ddmlib-proto-30.4.1.jar">
-            <sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.0.0">
-         <artifact name="android-device-provider-ddmlib-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.0.2">
+         <artifact name="android-device-provider-ddmlib-proto-31.0.2.jar">
             <sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2085,13 +1968,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="93aa2a29181c4f7404d0c49f6bb7c392713f9018e2cecc0a23f846e86c3f360b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="30.4.1">
-         <artifact name="android-device-provider-gradle-proto-30.4.1.jar">
-            <sha256 value="d8e9cdd6075752ed88422a5c37324d9aa6a2a0ea79abcbc61dcc89b8e47f8e98" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.0.0">
-         <artifact name="android-device-provider-gradle-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.0.2">
+         <artifact name="android-device-provider-gradle-proto-31.0.2.jar">
             <sha256 value="48f8b288d3b3195199ded91cbaa67a28be2fb9d317da187b88a7d4ffb505a578" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2103,13 +1981,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="cf36bcd4e8af5b240f8f7d80f231ffaf14a442cfe87dea16c5fc4fe8a16c05bb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="30.4.1">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-30.4.1.jar">
-            <sha256 value="e9ca7656307bff316ca4612a31e996b3e4bb3ca5471248e99add426ffd759936" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.0.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.0.2">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.0.2.jar">
             <sha256 value="6c4d0907badf886cbea14e56e8d08ce232ee775403ad811c27a280520d7efa1a" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2121,13 +1994,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f2e069b05d3b1d2ccffe9a30818ea67182f5376dc7b3ca802301ef3b75f8c69d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="30.4.1">
-         <artifact name="android-test-plugin-host-coverage-proto-30.4.1.jar">
-            <sha256 value="2f865cb722be65f8772b218afef4381a574506359b8fed792c077b40202ef210" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.0.0">
-         <artifact name="android-test-plugin-host-coverage-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.0.2">
+         <artifact name="android-test-plugin-host-coverage-proto-31.0.2.jar">
             <sha256 value="22686a7d1775171e76534ab8f40f9c9677cabc77321088e3268cb9cb74d0e5c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2152,8 +2020,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f4b034d37463a18df4fff04c3fb0155b65eeff8e58b9fb407035352b2cc8d517" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.0.0">
-         <artifact name="android-test-plugin-host-logcat-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.0.2">
+         <artifact name="android-test-plugin-host-logcat-proto-31.0.2.jar">
             <sha256 value="62234086f76d3dc1d1acbf9def72fcd7741ce2a10de587b4608ab45da62e9bc1" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2165,13 +2033,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2f887040b34faf247889a3e668289d919f4f71d8e93e23c0b89e3a429b3de061" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="30.4.1">
-         <artifact name="android-test-plugin-host-retention-proto-30.4.1.jar">
-            <sha256 value="b05e6429a93aa548d1ddc8b3a23affad850a7ac7a7424074517bf42c0b76f110" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.0.0">
-         <artifact name="android-test-plugin-host-retention-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.0.2">
+         <artifact name="android-test-plugin-host-retention-proto-31.0.2.jar">
             <sha256 value="031c4c933c5e53ddb863b960074ba36ec040a2464f208d4f5d390d2b227f6505" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2183,13 +2046,8 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9544d215345b1ac132bc77d421816e8a503af74dc596eac472824b0327f20e57" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="30.4.1">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-30.4.1.jar">
-            <sha256 value="d4fd8996ac9a03ee65d1b1823ebd6b70fb0c9b07252a6cd2a38614835b256707" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.0.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-31.0.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.0.2">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.0.2.jar">
             <sha256 value="38c664b016fc380676ab80fb9da0c42f13b049cfd98d16467a2049fe85072e70" origin="Generated by Gradle"/>
          </artifact>
       </component>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b22661d9bf..1a703c8b43 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists