Merge Android 12

Bug: 202323961
Merged-In: I7083ed5cfd0668b4673e4809eb804ac8556abda8
Change-Id: I26cf8f2f0f8d1a672799b7b26905d8acebe05e99
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..e39cbc4
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsWebkitTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsHostsideWebViewTests",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}
diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk
index d8f420c..fc22b82 100644
--- a/prebuilt/arm/webview.apk
+++ b/prebuilt/arm/webview.apk
Binary files differ
diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk
index 25fb667..ea00b23 100644
--- a/prebuilt/arm64/webview.apk
+++ b/prebuilt/arm64/webview.apk
Binary files differ
diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk
index c068c1e..960132b 100644
--- a/prebuilt/x86/webview.apk
+++ b/prebuilt/x86/webview.apk
Binary files differ
diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk
index 324f071..6df66d4 100644
--- a/prebuilt/x86_64/webview.apk
+++ b/prebuilt/x86_64/webview.apk
Binary files differ