Merge "Make ThemePicker override any other AOSP picker" into main am: 09461d20e3 am: 98be76a984

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/2706335

Change-Id: I53eced64399786e2c7bc25dd1ae268990362791b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 3694ea0..b7c0d00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,5 +118,5 @@
     platform_apis: true,
     manifest: "AndroidManifest.xml",
     additional_manifests: [":WallpaperPicker2_Manifest"],
-    overrides: ["WallpaperPicker2"],
+    overrides: ["WallpaperPicker", "WallpaperPicker2"],
 }