Merge changes from topic "revert-13183140-SettingsGoogle-bp-NMIISXZYTU"

* changes:
  Revert "Export proguard.flags, manifest and sources for use by S..."
  Revert "Build Settings-robo-testutils for use by SettingsGoogleR..."

Android.bp

@@ -93,21 +93,3 @@ android_library_import {
     name: "contextualcards",
     aars: ["libs/contextualcards.aar"],
 }
-
-filegroup {
-    name: "Settings_proguard_flags",
-    srcs: ["proguard.flags"],
-}
-
-// The sources for Settings need to be exposed to SettingsGoogle, etc.
-// so they can run the com.android.settingslib.search.IndexableProcessor
-// over all the sources together.
-filegroup {
-    name: "Settings_srcs",
-    srcs: ["src/**/*.java"],
-}
-
-filegroup {
-    name: "Settings_manifest",
-    srcs: ["AndroidManifest.xml"],
-}

tests/robotests/Android.bp

@@ -88,15 +88,3 @@ android_robolectric_test {
         "SettingsLib-search",
     ],
 }
-
-java_library {
-    name: "Settings-robo-testutils",
-    srcs: ["src/com/android/settings/testutils/**/*.java"],
-
-    libs: [
-        "Settings-core",
-        "Robolectric_all-target",
-        "mockito-robolectric-prebuilt",
-        "truth-prebuilt",
-    ],
-}