diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 7c3892ecbbac..f31fd127c819 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -58,8 +58,8 @@ object Versions {
         // The androidAapt plugin version must be in sync with the android plugin version.
         // Required for Gradle metadata verification to work properly, see:
         // https://github.com/gradle/gradle/issues/19228
-        const val android = "8.3.0"
-        const val androidAapt = "$android-10880808"
+        const val android = "8.4.0"
+        const val androidAapt = "$android-11315950"
         const val playPublisher = "3.9.0"
         const val protobuf = "0.9.4"
         const val dependencyCheck = "10.0.3"
diff --git a/android/gradle.properties b/android/gradle.properties
index 324e171187d3..74c277e3a155 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,4 +3,3 @@ android.nonTransitiveRClass=false
 android.useAndroidX=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M"
-android.experimental.lint.version = 8.4.0
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index 297de34095cf..72c84a291c09 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -1188,14 +1188,14 @@
             <sha256 value="903034d5152dd2e0162b1468ea25a22e1ca384006b3d282d5a143cc760321a01" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="8.3.0">
-         <artifact name="databinding-common-8.3.0.jar">
+      <component group="androidx.databinding" name="databinding-common" version="8.4.0">
+         <artifact name="databinding-common-8.4.0.jar">
             <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="8.3.0">
-         <artifact name="databinding-compiler-common-8.3.0.jar">
-            <sha256 value="456006224e620e38bd5d61b2ee8517d606a9953974e8d32da1616f1b48be7330" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.4.0">
+         <artifact name="databinding-compiler-common-8.4.0.jar">
+            <sha256 value="b814e97669db30386502d75a78de52d8654c67ec386997f6e12adbcc6802ed9d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
@@ -2115,13 +2115,13 @@
             <sha256 value="ddd43652b0b5d9f9c8b8d3def9ed5767d39a34a5af43be28e0c438e8e86caef9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="8.3.0">
-         <artifact name="signflinger-8.3.0.jar">
+      <component group="com.android" name="signflinger" version="8.4.0">
+         <artifact name="signflinger-8.4.0.jar">
             <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="8.3.0">
-         <artifact name="zipflinger-8.3.0.jar">
+      <component group="com.android" name="zipflinger" version="8.4.0">
+         <artifact name="zipflinger-8.4.0.jar">
             <sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2135,36 +2135,21 @@
             <sha256 value="df0d7ce011d3df3e7bca0f5c6de74c74690797ddc54fb70677a49c612db8fd5a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="8.3.0">
-         <artifact name="baseLibrary-8.3.0.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="8.4.0">
+         <artifact name="baseLibrary-8.4.0.jar">
             <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="31.3.0">
-         <artifact name="annotations-31.3.0.jar">
-            <sha256 value="ee3bfd9cdb5012bdb61520f8654a785577e9bb337e5939c5c6149a446684ee16" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="annotations" version="31.4.0">
          <artifact name="annotations-31.4.0.jar">
             <sha256 value="25e8825547de7146d08fa18f04ef934ee1e6aec52e4c97ffa510a8f0f44b07a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="31.3.0">
-         <artifact name="common-31.3.0.jar">
-            <sha256 value="803fc4e4cc5e66c5db094071f4ccdb447ff154072154168eba2c49116f59b8d0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="common" version="31.4.0">
          <artifact name="common-31.4.0.jar">
             <sha256 value="d7ce03f7ae4a8b7ad17d5fb61a3beac15c73aff818eac51dedf8e35c204162f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="31.3.0">
-         <artifact name="dvlib-31.3.0.jar">
-            <sha256 value="0cb57c126ed95657ae1e0974af092b401a52b76d5683f7ccbe1f8f21af06794e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="dvlib" version="31.4.0">
          <artifact name="dvlib-31.4.0.jar">
             <sha256 value="bf962bea906e1dc8a3273b8129999eaea3bb16fcb2b9deea1450dc6fb2ef9073" origin="Generated by Gradle"/>
@@ -2175,88 +2160,50 @@
             <sha256 value="68840b9dc064724dbe12844e0c59e325ac4dfaa818bf3262635bd5254010a29c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="31.3.0">
-         <artifact name="repository-31.3.0.jar">
-            <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="repository" version="31.4.0">
          <artifact name="repository-31.4.0.jar">
             <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="31.3.0">
-         <artifact name="sdk-common-31.3.0.jar">
-            <sha256 value="81e5391e6b93c8237eda17bb24b26a9b28d5abe7217a5553da2dabf1bd00656d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="sdk-common" version="31.4.0">
          <artifact name="sdk-common-31.4.0.jar">
             <sha256 value="f38eba4bbfb6d541dc8c2be38c31e7389d0acdc354b234f258b6ee89e8ddce6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="31.3.0">
-         <artifact name="sdklib-31.3.0.jar">
-            <sha256 value="4826724b88f6c9ecbf1ad93a1b4edfd80941cef9d54093d645cf0796238dd0b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="sdklib" version="31.4.0">
          <artifact name="sdklib-31.4.0.jar">
             <sha256 value="7d05caeddb635d87d04b4de70f9ee78a247514665ab57f25c07d2ba4e7af0f5b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="31.3.0">
-         <artifact name="crash-31.3.0.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="31.4.0">
+         <artifact name="crash-31.4.0.jar">
             <sha256 value="2c5c26420967675c074bc7140831fe3bff5bbabc7fbbc08ba29fdc3eadcc9510" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="31.3.0">
-         <artifact name="protos-31.3.0.jar">
-            <sha256 value="b3bb4f776c7da4e49d127063b978e4175de5402e8ecc35e983cfc7311e195898" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="protos" version="31.4.0">
          <artifact name="protos-31.4.0.jar">
             <sha256 value="c2bb6199304d595cb9b60f282d1bb5016c838809b33c90bf8aaf9a769a58115b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="31.3.0">
-         <artifact name="shared-31.3.0.jar">
-            <sha256 value="1ddf8b7c36aa336d8d982516b2a503c922e18e9972967b0d2a2ee43561bb97c9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="shared" version="31.4.0">
          <artifact name="shared-31.4.0.jar">
             <sha256 value="971e224c62bb2f05ca8f4f37ed29ac8f91914b39eb8ac620ba92a2e0ea38bc7d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="31.3.0">
-         <artifact name="tracker-31.3.0.jar">
-            <sha256 value="961a4be424dc9d16ba85d81d4560d731ba5fdf52ddb033903e533ea871e48a47" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="tracker" version="31.4.0">
          <artifact name="tracker-31.4.0.jar">
             <sha256 value="542c6c0070a7df6254050532f2a14aa9db5553a0fc2cb203fdba7b721523e716" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2" version="8.3.0-10880808">
-         <artifact name="aapt2-8.3.0-10880808-linux.jar">
-            <sha256 value="d5c7a4bbf71f483c99f808c7ce74e4f1bc859e71a9411dfd33cf5de6e5a2dcfa" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aapt2-8.3.0-10880808-osx.jar">
-            <sha256 value="26f829814e45066e61dcd5fdbb3936207e866e58eb4fe2bda67e76c82b401ad6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2" version="8.4.0-11315950">
+         <artifact name="aapt2-8.4.0-11315950-linux.jar">
+            <sha256 value="5638a5b151f9c50ba2a9e5291edfc9227aec3fedc3ee8f8a8583fa54cd1dd9ca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-8.3.0-10880808-windows.jar">
-            <sha256 value="f62f50a652d102bc91d6f3102e4c7b46a20a566a9cb1b72d41b54afd1c8c2efe" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="8.3.0-10880808">
-         <artifact name="aapt2-proto-8.3.0-10880808.jar">
-            <sha256 value="d5f3da080c9b8d92aef8e92583f269a8304ccea4540cc27498d63804ee47b756" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.4.0-11315950-osx.jar">
+            <sha256 value="05d9ece54eb37b7b6fcf76df1a379b5b29543fb84adab2804446cf36bdad4477" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-8.3.0-10880808.module">
-            <sha256 value="aa77cd924d5a6b365cc7cff5926458c0d87d6d5710612b04f506f5c09ea12dc7" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.4.0-11315950-windows.jar">
+            <sha256 value="e153516c5e2933528c816c05ff9e21b189ac8c4b1bc456e468af71f6ea8229fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="8.4.0-11315950">
@@ -2267,38 +2214,30 @@
             <sha256 value="15c5e990f6404c9ec52ed3561c1dc454175089ae5ad14037f2759af14f994959" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="8.3.0">
-         <artifact name="aaptcompiler-8.3.0.jar">
-            <sha256 value="4e496723b3d1616785fb883328d9ea6bc02c92a11690b7f02ae51e639a5a5491" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.4.0">
+         <artifact name="aaptcompiler-8.4.0.jar">
+            <sha256 value="bef2f718a07a2bf5affcf54bccd94dc7a8fdd4042772cd89719b377a2972e189" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-8.3.0.module">
-            <sha256 value="35364a28201b38717f90c27e91c44cf73e1ec9c707e02542db3930ee393b78a3" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-8.4.0.module">
+            <sha256 value="ce588080d6fc63d15a24d77aec6e0c995d67d01c3a981c523f318270c1376cda" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="8.3.0">
-         <artifact name="apksig-8.3.0.jar">
-            <sha256 value="468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="apksig" version="8.4.0">
+         <artifact name="apksig-8.4.0.jar">
+            <sha256 value="c4f6fdf2148490296f422a7eb37647ea11d1c3b02f1f2349c33ce257f3c29b1f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="8.3.0">
-         <artifact name="apkzlib-8.3.0.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="8.4.0">
+         <artifact name="apkzlib-8.4.0.jar">
             <sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="8.3.0">
-         <artifact name="builder-8.3.0.jar">
-            <sha256 value="88b5a476fb1433ef73de51bc233bba890977e8692393353d0c192e2e090fcd80" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder" version="8.4.0">
+         <artifact name="builder-8.4.0.jar">
+            <sha256 value="0171bb226224709aa8d0ab4f3bf3163647ed232ade3a851319dd2126c8934119" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-8.3.0.module">
-            <sha256 value="ed616ba10473ba54b47e0ecd659a8aecb34fed73a40ba97abead0fe38e0b354b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-model" version="8.3.0">
-         <artifact name="builder-model-8.3.0.jar">
-            <sha256 value="48cebf9813f97b6649585ad29d2b90c2c356ad608d2dbfc0e843fc019c4f14c6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-model-8.3.0.module">
-            <sha256 value="b5db86a2a1800614cdf2fff96850c986a913ec29a14529e7d9d211410aa64e3f" origin="Generated by Gradle"/>
+         <artifact name="builder-8.4.0.module">
+            <sha256 value="76bb2d6d162b7bc3c058a7c064290d3a85ce15d96aedc848b1a6fec8a5af424c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="builder-model" version="8.4.0">
@@ -2309,12 +2248,12 @@
             <sha256 value="aa3ed4955f7b03e78db970ea8cd5bc0bf975644f41215a7b489c8bbd8a20ef25" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="8.3.0">
-         <artifact name="builder-test-api-8.3.0.jar">
-            <sha256 value="ca8065f9f26960455982beb48b74cd36b2aa4927ed8aef345cc761000416367f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.4.0">
+         <artifact name="builder-test-api-8.4.0.jar">
+            <sha256 value="ab6c1db019eb72dc626a21fae555f44b2da7c0622ae730cd93846810cc1f532d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-8.3.0.module">
-            <sha256 value="1bfaa565348548b3800eea9dbc51a24d02067faa226e65f2ed7497a995b1abb6" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-8.4.0.module">
+            <sha256 value="09f960e284da53f9993e1bef82ad330eaa8b08342705a881ed04cdcd33c3e68e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="bundletool" version="1.15.6">
@@ -2322,36 +2261,28 @@
             <sha256 value="f66992e537adb12ffa6d181cdc536d564b1c4b4b4c5972b4891706c6533a4641" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="8.3.0">
-         <artifact name="gradle-8.3.0.jar">
-            <sha256 value="2373ffe9dd5928b2d3f2696d4d4d5f061d24d49582850dd9f05d9740f9c360d9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-8.3.0.module">
-            <sha256 value="931ecb1149a631bbe89abc11e4a26e4962fe337a95896a0b4c4cecd83b84ea01" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle-api" version="8.3.0">
-         <artifact name="gradle-api-8.3.0.jar">
-            <sha256 value="1771f97fb74b7d799b8da8de9e4bee2ae75e58b472721596662c46799dc86bae" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle" version="8.4.0">
+         <artifact name="gradle-8.4.0.jar">
+            <sha256 value="d825d48ed34302f0ce7f4fdfae17b8ee1c345694e1a30dd1e86dad718de2600f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-8.3.0.module">
-            <sha256 value="0a275310949234de2179a28afd8e136fc855b7afc11c8f3f155c8242d5bfa316" origin="Generated by Gradle"/>
+         <artifact name="gradle-8.4.0.module">
+            <sha256 value="38b2ea3d54270f92ef35210438cfd3d6e1d50536ea2d18db034e282aafbe8453" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="8.3.0">
-         <artifact name="gradle-settings-api-8.3.0.jar">
-            <sha256 value="3df4a3d8947ca5e7f1bdeef99969b49e3a1a0d25c776d2c86100741274186f73" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-api" version="8.4.0">
+         <artifact name="gradle-api-8.4.0.jar">
+            <sha256 value="e445fb24c9da08d8a622626263f1e4d973fad9223fe054d9631e4f9b6a8d79fc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-8.3.0.module">
-            <sha256 value="2d0954f86ec8e84929a67bf0f4ed99dd55eb93a0f56782e279f9eaad539d3e29" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-8.4.0.module">
+            <sha256 value="0fca77a2c2801208a2573e4b2ada6d19173ec8ab88d594199f7ab12b2258a81a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="31.3.0">
-         <artifact name="manifest-merger-31.3.0.jar">
-            <sha256 value="726b07b4b1036e50d0f50e5e4cb54c2881140d9b1ca77b18e0bf47ad788ce8d8" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.4.0">
+         <artifact name="gradle-settings-api-8.4.0.jar">
+            <sha256 value="d9f43bf45b8e642803997216012236baa076574cafb89cd95a315ac7c38ea8e6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-31.3.0.module">
-            <sha256 value="fdb038141e495e8211df2a6be90ed6e9d9b48966b817f008137512da8778ccf1" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-8.4.0.module">
+            <sha256 value="ce2fd5d85d6c09b1e5fade21e5716f416c69a9d5da25656a7356d7f76dc3b930" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="manifest-merger" version="31.4.0">
@@ -2383,18 +2314,13 @@
             <sha256 value="36c25576b19993df360170528cc62b7246c37776d6158154a67cdf8fc2d58e13" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="31.3.0">
-         <artifact name="ddmlib-31.3.0.jar">
-            <sha256 value="88afc3e88f0b27dff3d4686765d140cb172161a710708e1861dda6fd689c117c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.ddms" name="ddmlib" version="31.4.0">
          <artifact name="ddmlib-31.4.0.jar">
             <sha256 value="f98b88cfe0fe729d755f0bf6d5fc21e20f89aea9e630860dc0f75dcbec6fec0b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.emulator" name="proto" version="31.3.0">
-         <artifact name="proto-31.3.0.jar">
+      <component group="com.android.tools.emulator" name="proto" version="31.4.0">
+         <artifact name="proto-31.4.0.jar">
             <sha256 value="5994f35bcfe498aee92a82340b7600902439b1aa153b9398591105c4e00bb994" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2413,11 +2339,6 @@
             <sha256 value="0df6547b37453f5ad2006179cd65b0ab7109b8f67b837d739509b2ff4f8310b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.3.0">
-         <artifact name="layoutlib-api-31.3.0.jar">
-            <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.4.0">
          <artifact name="layoutlib-api-31.4.0.jar">
             <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
@@ -2443,159 +2364,149 @@
             <sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="31.3.0">
-         <artifact name="lint-model-31.3.0.jar">
-            <sha256 value="243bb5e90bef1f94b419506bc9c236e86cecd977220e89ddb9e9f973b9e56ce1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-model" version="31.4.0">
          <artifact name="lint-model-31.4.0.jar">
             <sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.3.0">
-         <artifact name="lint-typedef-remover-31.3.0.jar">
-            <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.4.0">
          <artifact name="lint-typedef-remover-31.4.0.jar">
             <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.3.0">
-         <artifact name="android-device-provider-ddmlib-31.3.0.jar">
-            <sha256 value="a71fc178f2f361463d4290a73e123fe9aa74eb8450c303dcb863e08d02b83b7e" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.4.0">
+         <artifact name="android-device-provider-ddmlib-31.4.0.jar">
+            <sha256 value="fd1cf6b06e1743896944ce545874258e2b6dfc5519db4dceb091aff6c7c2d37a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-31.3.0.module">
-            <sha256 value="a9fa5f722bb457a5991ad56c592b2cb6e9b80b34027175c20ad4edfe619e163e" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-31.4.0.module">
+            <sha256 value="758154bf748711793b13bbc1336e9c37c1f62c46c9e6b1865092978df2c9953f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.3.0">
-         <artifact name="android-device-provider-ddmlib-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.4.0">
+         <artifact name="android-device-provider-ddmlib-proto-31.4.0.jar">
             <sha256 value="da9f3f3dae26544c90668549584765d5854a87c425d2cfe577cd34d3600ea097" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.3.0">
-         <artifact name="android-device-provider-gradle-31.3.0.jar">
-            <sha256 value="ad742e94bafe84216cfa313bfc01d222e7ab33d7527db2baba48b83fed5afb05" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.4.0">
+         <artifact name="android-device-provider-gradle-31.4.0.jar">
+            <sha256 value="da9f91cc945f8c39e1c69ded8aefa3fec9638c35dcb3439aa81ca6971d901698" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-gradle-31.3.0.module">
-            <sha256 value="e743e81e2a10dc21bf1ee78a7c26cc80824a60a4e2b27bd8b43bf43943eca7a8" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-gradle-31.4.0.module">
+            <sha256 value="6ef4b838575983b4c2d180439a93d890723abe642239487fc9921c9cf445347b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.3.0">
-         <artifact name="android-device-provider-gradle-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.4.0">
+         <artifact name="android-device-provider-gradle-proto-31.4.0.jar">
             <sha256 value="ad2342bb1d6f95563400a322493ea1c229cb93df3944f1261b7399f718494049" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-31.3.0.jar">
-            <sha256 value="30a538d5d624e75cd8a957f1e9351db12347c43a59cb22c24c2a5ac9108a0298" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.4.0">
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.0.jar">
+            <sha256 value="fba57197622753863fdf9b2042518d47e9f9e44eddc315ddfd99d75eb8db044f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-31.3.0.module">
-            <sha256 value="1ec5ac70d915d700c2909b1e8848c281b0406e581ebd9725212692e98d89a9e2" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.0.module">
+            <sha256 value="5189f7d877b053052cc13d37795f1b40d9d6df47871a176184c0523fe1ddf15f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.4.0.jar">
             <sha256 value="38450694de6328c2c4cba696f9c04ecdd5ce6952355f68c3a22f9541d1d6546f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-31.3.0.jar">
-            <sha256 value="8b7dc5bdc10f177f82ca89885eaa3eeac19db4ac54eccb21091bd155f6ca0309" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.4.0">
+         <artifact name="android-test-plugin-host-apk-installer-31.4.0.jar">
+            <sha256 value="39642d001acffc5a131f389ce2997f3e0f23c1e31fea292107c8cd5d267f024b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-31.3.0.module">
-            <sha256 value="63ae877e87c04b34273c7a2ccad970160827b56ce58073391b01ded1c806e00a" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-31.4.0.module">
+            <sha256 value="37439eb2e3ad2e5dbc3ec32b6b441045fa962e652af87e679e9823f79feea7f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-proto-31.3.0.jar">
-            <sha256 value="df8a31a9a5e05f6915cf55123bbfd36ad73229686bb13c6f40e951ec933c21bf" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.4.0.jar">
+            <sha256 value="ced49aca4031aa2c57b51d3909ba815082e563c1d9a246bc23ede973782524f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.3.0">
-         <artifact name="android-test-plugin-host-coverage-31.3.0.jar">
-            <sha256 value="87cb362de7c5fd4a86e99819a1dfb1e22a9fe6edda2460eb4ae9eca347cb5183" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.4.0">
+         <artifact name="android-test-plugin-host-coverage-31.4.0.jar">
+            <sha256 value="f31d6f556b384987b749fdd539b0fc5744e12b67e81ce6a1c6e5414c52d828bf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-31.3.0.module">
-            <sha256 value="44900f9ca77dc4130d859bfdba638f5f64e3b005532f5e5a994e51df39b200f9" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-31.4.0.module">
+            <sha256 value="1b4be5360224783ecbfa39cf3463359a095c8149bedf6995b7756181cb3b8a66" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-coverage-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-coverage-proto-31.4.0.jar">
             <sha256 value="efb4d7014aaa7355246a07c2e437a2231fb252540ff1bce6872c88dc8da89d12" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.3.0">
-         <artifact name="android-test-plugin-host-device-info-31.3.0.jar">
-            <sha256 value="40a6c9ef6971fee24bd06f06d8a6c7f77c076930f6e277aed651b625e9762007" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.4.0">
+         <artifact name="android-test-plugin-host-device-info-31.4.0.jar">
+            <sha256 value="4caffd2c254737596dbd3a56a138a691f668b21d8b2e882488d1dcac3e366c7f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-31.3.0.module">
-            <sha256 value="42c6623b2892ada2215ab954b800bafb3f8894e092c36d85186b3dda01db5fc6" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-31.4.0.module">
+            <sha256 value="b26c2362be457fe197701614a7a9f57b66b081e3f246f681fb59e093e8618ebf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-device-info-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-device-info-proto-31.4.0.jar">
             <sha256 value="4f5eccc1d47a981b3ff120e98a3de0988214108fe9dc7b068e95a6b686ada495" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-31.3.0.jar">
-            <sha256 value="49e7d144620c1f0c1ee507fc74677f48cbd78d42a6cb277a7ee48c6993ad3513" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.4.0">
+         <artifact name="android-test-plugin-host-emulator-control-31.4.0.jar">
+            <sha256 value="e805505739a07d9601c0056da56961d7c094e363e2c2181cd6549a9709cf17e3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-31.3.0.module">
-            <sha256 value="17abd77b18474966e1194ceb05a605d89edb3e9acf274e582e9fe00b653ddab1" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-31.4.0.module">
+            <sha256 value="793c454d45cfea081aaecde2939cc7fa73a8fda1573372e261370a2f03088919" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.4.0.jar">
             <sha256 value="aedec5ec4627d898cccdf42d8038db20eba4495753c53d1b0b378734491caf5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.3.0">
-         <artifact name="android-test-plugin-host-logcat-31.3.0.jar">
-            <sha256 value="ec0fea6ccf09f1971e471b9f62045294b479341c6bf2ce276dd76be817033fb4" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.4.0">
+         <artifact name="android-test-plugin-host-logcat-31.4.0.jar">
+            <sha256 value="a78beb10162e7c28b57fcde777c12f895121fa38a2a776366d73517b359dfe88" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-31.3.0.module">
-            <sha256 value="1c6576d2d1c37b93d50bf263d138ba5d22e94a9991ba859f9a12d8d34672fd7a" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-31.4.0.module">
+            <sha256 value="9bb194a27fbf786c721c18bd4a3f8bebe0f3464f9fce5dc18b3fe8097cedbed5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-logcat-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-logcat-proto-31.4.0.jar">
             <sha256 value="9129024bd8e38353bca3eb26dfd8e3628e058d57d6e9d8451ffc35f016751e63" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.3.0">
-         <artifact name="android-test-plugin-host-retention-31.3.0.jar">
-            <sha256 value="fd056e3b430d4f14afb9d298954558567babf73fb8bef3203d575bc1605a0a0e" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.4.0">
+         <artifact name="android-test-plugin-host-retention-31.4.0.jar">
+            <sha256 value="7e380d328c9b3da7064b18ef79eed7957ef57faa8581b5b8f7d4264c778958bd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-retention-31.3.0.module">
-            <sha256 value="e29c940eb116e72e25f90d4ed79c5713fc79793e72be173563c2d61b454396bc" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-retention-31.4.0.module">
+            <sha256 value="f80c5074497e855051ee332d9eae030ae27e79d5fda5a371d2088242cbff67bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-retention-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-retention-proto-31.4.0.jar">
             <sha256 value="3db8ed38ef49b694caea466ae22e3b36cedc9557b3589d0e07c0cdd83294591c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-31.3.0.jar">
-            <sha256 value="70105f8ed9b97ba5fff191a7052aad68ad9f9723cfd755d55983927b34c805b2" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.4.0">
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.0.jar">
+            <sha256 value="709a4c4703ef81eef8511d3b747a46c09d8f0ceaf99eee1c449afefbb41736c8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-31.3.0.module">
-            <sha256 value="63d840c51a4505ee17cfe7b2a39270658afe16ca5813558cc9ef2b5cd9ca6583" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.0.module">
+            <sha256 value="9119cef6eed301cae0dadc58ab20bf74a540ba08d30c38a45aad974a47418153" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.4.0">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.4.0.jar">
             <sha256 value="cbdf71bca60e14c30e7b2cf4b90f0f0a3e8c138f7cadd874b0d9c0ae082e0274" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="utp-common" version="31.3.0">
-         <artifact name="utp-common-31.3.0.jar">
-            <sha256 value="110f4689ae0a501787687fc96d2995f79378aa44528e9428b5b033d3aaa6cf51" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="utp-common" version="31.4.0">
+         <artifact name="utp-common-31.4.0.jar">
+            <sha256 value="bb150aea0c945d38f3360a7eb656d9e721b1cc6cddb36d50fe392cf7015762ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.volley" name="volley" version="1.2.1">
@@ -4450,26 +4361,11 @@
             <sha256 value="57f9ab76a8358abbea90ba1ef8e553b8ae3d07b2337078a4ca20b1cbd48b4ec5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.67">
-         <artifact name="bcpkix-jdk15on-1.67.jar">
-            <sha256 value="efbca754880ce3922ca47a43c1f0b72c45731450a0ef193b9db33bf4bb38ce5f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.77">
          <artifact name="bcpkix-jdk18on-1.77.jar">
             <sha256 value="1ac7fe8efd5b2f38cdc165be5a0675734fe44808dab92707201f03a535d6f1b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.67">
-         <artifact name="bcprov-jdk15on-1.67.jar">
-            <sha256 value="fa0041a36f9f20af3c6b8dbf6eb49a969e2c9cc029049d61acc526ba3247b3ef" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.71">
-         <artifact name="bcprov-jdk18on-1.71.jar">
-            <sha256 value="f3433a97d780fe9fa3dc3d562a41decd59b2e617ce884de9060349ac14750045" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.77">
          <artifact name="bcprov-jdk18on-1.77.jar">
             <sha256 value="dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58" origin="Generated by Gradle"/>