Merge Android U (ab/10368041)tmp_amf_298295554

Bug: 291102124
Merged-In: If8ba4411d48b2066753105cedadfed41472410cb
Change-Id: I0fd964e7dd4095659325a27f16c7d879d7469025

3 files changed, 34 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index ac520878..6d64285d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,10 @@ android_library {
     srcs: [
         "lottie/src/main/**/*.java",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
     resource_dirs: ["lottie/src/main/res/"],
     static_libs: [
         "androidx.appcompat_appcompat",
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 00000000..848e02d6
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+dupin@google.com
+mrulhania@google.com
+
+#permission controller team
+include platform/frameworks/base:/core/java/android/permission/OWNERS
\ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 00000000..2c094637
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,25 @@
+{
+    "presubmit-large": [
+        {
+            "name": "CtsPermission3TestCases",
+            "options": [
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                }
+            ]
+        }
+    ],
+    "mainline-presubmit": [
+        {
+            "name": "CtsPermission3TestCases[com.google.android.permission.apex]",
+            "options": [
+                {
+                    "include-filter": "android.permission3.cts.LocationAccuracyTest"
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file