Merge "Rb back compat: Base changes" into tm-mainline-prod
diff --git a/Android.bp b/Android.bp
index 0a54e69..fa5dc9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
 	"com.android.ondevicepersonalization",
     ],
 }
@@ -110,11 +111,12 @@
     apex_available: [
         "//apex_available:platform",
          "com.android.adservices",
-	 "com.android.ondevicepersonalization",
+         "com.android.extservices",
+         "com.android.ondevicepersonalization",
     ],
     visibility: [
         "//packages/modules/AdServices:__subpackages__",
 	"//packages/modules/OnDevicePersonalization:__subpackages__",
         ":__subpackages__",
     ],
-}
\ No newline at end of file
+}
diff --git a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
index 94a9200..4d4bf99 100644
--- a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
+++ b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp
@@ -35,6 +35,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
-	"com.android.ondevicepersonalization",
+        "com.android.extservices",
+        "com.android.ondevicepersonalization",
     ],
-}
\ No newline at end of file
+}
diff --git a/proto/Android.bp b/proto/Android.bp
index fc243bd..5e22797 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -32,6 +32,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
-	    "com.android.ondevicepersonalization",
+        "com.android.extservices",
+        "com.android.ondevicepersonalization",
     ],
-}
\ No newline at end of file
+}