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

packages/SettingsLib/ActionBarShadow/Android.bp

@@ -23,6 +23,7 @@ android_library {
     apex_available: [
         "//apex_available:platform",
         "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",
     ],
 }

packages/SettingsLib/MainSwitchPreference/Android.bp

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

packages/SettingsLib/SettingsTheme/Android.bp

@@ -12,9 +12,7 @@ android_library {
 
     resource_dirs: ["res"],
 
-    static_libs: [
-            "androidx.preference_preference",
-        ],
+    static_libs: ["androidx.preference_preference"],
 
     sdk_version: "system_current",
     min_sdk_version: "21",
@@ -22,6 +20,7 @@ android_library {
         "//apex_available:platform",
         "com.android.adservices",
         "com.android.cellbroadcast",
+        "com.android.extservices",
         "com.android.permission",
         "com.android.mediaprovider",
     ],

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",
     ],
 }

packages/SettingsLib/Utils/Android.bp

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