Merge "Fixes crash on launch of AOSP+Soong builds" into main
diff --git a/Android.bp b/Android.bp
index 44ec269..58e6413 100644
--- a/Android.bp
+++ b/Android.bp
@@ -135,7 +135,7 @@
 android_app {
     name: "ThemePicker",
     package_name: "com.android.wallpaper",
-    defaults: ["ThemePicker_defaults"],
+    defaults: ["ThemePicker_defaults_with_overrides"],
 
     platform_apis: true,
     manifest: "AndroidManifest.xml",