[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: cff04672 -s ours

am skip reason: Merged-In I2e6445e248afe9c0a6e58d23e9faa983b3864007 with SHA-1 4503c550 is already in history

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



Change-Id: I7a26ad870f35c8ee495b0b030f59ced2bcbe02c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>