Make ThemePicker override any other AOSP picker

Bug: b/294871815
Test: manually verified that ThemePicker is chosen
Change-Id: I9e7a13fd9b32ff9f15774d50525e902bc0cbde81
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"],
 }