[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: 4e824c760f -s ours

am skip reason: Merged-In I7c8818478477497ffdda60ed5993d4f801f02d9f with SHA-1 9fcf45773f is already in history

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

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