Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am: 15a5bdb953

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21186901

Change-Id: I19ea90fe4b25d4bb0aadd8ee975bea100a02a0bd
Merged-In: I586521b19121c52f87c8bf1d0105dcf9ffc09ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 263816046
Ignore-AOSP-First: Automerger fix

packages/SettingsLib/ActionBarShadow/Android.bp

@@ -22,7 +22,8 @@ android_library {
     min_sdk_version: "28",
     apex_available: [
         "//apex_available:platform",
-        "com.android.permission",
         "com.android.adservices",
+        "com.android.extservices",
+        "com.android.permission",
     ],
 }

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

@@ -27,6 +27,7 @@ android_library {
         "//apex_available:platform",
         "com.android.adservices",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.permission",
         "com.android.healthfitness",
     ],

packages/SettingsLib/MainSwitchPreference/Android.bp

@@ -25,6 +25,7 @@ android_library {
         "//apex_available:platform",
         "com.android.adservices",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.healthfitness",
     ],
 }

packages/SettingsLib/SettingsTheme/Android.bp

@@ -9,18 +9,14 @@ package {
 
 android_library {
     name: "SettingsLibSettingsTheme",
-
     resource_dirs: ["res"],
-
-    static_libs: [
-        "androidx.preference_preference",
-    ],
-
+    static_libs: ["androidx.preference_preference"],
     sdk_version: "system_current",
     min_sdk_version: "21",
     apex_available: [
         "//apex_available:platform",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.permission",
         "com.android.adservices",
         "com.android.healthfitness",

packages/SettingsLib/SettingsTransition/Android.bp

@@ -22,6 +22,7 @@ android_library {
         "//apex_available:platform",
         "com.android.adservices",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.permission",
         "com.android.healthfitness",
     ],

packages/SettingsLib/Utils/Android.bp

@@ -24,8 +24,9 @@ android_library {
 
         "//apex_available:platform",
         "com.android.adservices",
-        "com.android.permission",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.healthfitness",
+        "com.android.permission",
     ],
 }