Upgrade to espresso 3.5.0-alpha06

Fixes compatibility with Android T.

Remove a couple usages of deprecated APIs
Add a workaround for https://github.com/android/android-test/issues/1352

Test: ./gradlew assembleAndroidTest --dry-run
Bug: 229302912
Change-Id: I32a80e5b7515ea9110bc507d9228852e0aec0edb
Merged-In: I32a80e5b7515ea9110bc507d9228852e0aec0edb
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5de377d..c408a6e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@
 cmake = "3.22.1"
 dagger = "2.40.1"
 dexmaker = "2.25.0"
-espresso = "3.3.0"
+espresso = "3.5.0-alpha06"
 guavaJre = "31.1-jre"
 hilt = "2.40.1"
 incap = "0.2"
@@ -45,6 +45,7 @@
 wire = "3.6.0"
 
 [libraries]
+androidAccessibilityFramework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version = { strictly = "2.1" } }
 androidBuilderModelMin = { module = "com.android.tools.build:builder-model", version.ref = "androidGradlePluginMin" }
 androidGradlePluginz = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
 androidLint = { module = "com.android.tools.lint:lint", version.ref = "androidLint" }
@@ -77,7 +78,7 @@
 dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version = "4.1.1" }
 dokkaGradlePluginz = { module = "org.jetbrains.dokka:dokka-android-gradle-plugin", version = "0.9.17-g014" }
 dom4j = { module = "org.dom4j:dom4j", version = "2.1.3" }
-espressoContrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
+espressoContribInternal = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
 espressoCore = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 espressoIdlingNet = { module = "androidx.test.espresso.idling:idling-net", version.ref = "espresso" }
 espressoIdlingResource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
@@ -191,3 +192,8 @@
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinMp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+
+[bundles]
+# prevent androidAccessibilityFramework 3.1 which pulls hamcrest 2.2, breaking espresso-core
+# https://github.com/android/android-test/issues/1352
+espressoContrib = ["androidAccessibilityFramework", "espressoContribInternal"]