Merge Android 12

Bug: 202323961
Merged-In: I74c4c80e03bfa41b9e8cd13f3cfcbe9ac6efdd50
Change-Id: I47419802b14a2d3e65929070cdb46d4c4bd9d75d
diff --git a/Android.bp b/Android.bp
index e0288bf..837c0fe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,6 +70,7 @@
 
     apex_available: [
         "//apex_available:platform",
+        "com.android.appsearch",
         "com.android.extservices",
     ],
 }