Merge Android U (ab/10368041)tmp_amf_298295554

Bug: 291102124
Merged-In: Ib36b3c86271b694e3dfed2e3ab55294e90733866
Change-Id: If9432c1d66d3fc81d5aef8a9ae59eb165095ff00

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f165fdf6..d1c46b25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,9 @@ java_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.devicelock",
         "com.android.extservices",
+        "com.android.permission",
     ],
     static_libs: [
         "guava-android-annotation-stubs",
@@ -34,4 +36,5 @@ java_library {
         "-Xmulti-platform",
     ],
     sdk_version: "core_current",
+    min_sdk_version: "30",
 }