Merge Android 12

Bug: 202323961
Merged-In: I18fafce9c9c2f412a44dcf9455d886c398c8011a
Change-Id: Ie0bfc70d62059cae89f7c240d9ebc97e81175180
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fed9cac..d58e4e0 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,6 +1,13 @@
 {
     "presubmit": [
         { "name": "oob_oggpack_look" }
+    ],
+
+    // tests which require dynamic content
+    // invoke with: atest -- --enable-module-dynamic-download=true
+    // TODO(b/148094059): unit tests not allowed to download content
+    "dynamic-presubmit": [
+        { "name": "VorbisDecoderTest" }
     ]
 }