Snap for 9550733 from 482dbe4e20f2a54e150670b09591a538cceb3ed3 to mainline-tzdata5-release

Change-Id: Id634f494586c6c59e37a347a9c1656a15122eed7

2 files changed, 7 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 6924ca2b..5fd6b57e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,11 @@ java_library {
         "okio/src/jvmMain/**/*.kt",
         "okio/src/commonMain/**/*.kt",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.devicelock",
+        "com.android.permission",
+    ],
     static_libs: [
         "guava-android-annotation-stubs",
     ],
@@ -28,5 +33,5 @@ java_library {
         "-Xmulti-platform",
     ],
     sdk_version: "current",
-    java_version: "1.7",
+    min_sdk_version: "30",
 }
diff --git a/OWNERS b/OWNERS
index 25abe552..f5df99de 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
-arangelov@google.com
+file:platform/frameworks/base:/core/java/android/app/admin/WorkDeviceExperience_OWNERS
 stanleytfwang@google.com
-alexkershaw@google.com