Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':

Change-Id: Ic491b4df2d08695c1b42117d9a784edf2f38b6b5
diff --git a/Android.bp b/Android.bp
index 4741c58..fd632a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -124,4 +124,6 @@
         "30",
         "current",
     ],
+    imports_sdk_version: "none",
+    imports_compile_dex: true,
 }