[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 805d10b84f am: 7fea6dc690 -s ours

am skip reason: Merged-In I6c4adbb804758f159b90a965456bd8c0e6e36c39 with SHA-1 52fb20953f is already in history

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

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