[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 6d56fbbcc7 -s ours

am skip reason: Merged-In Id880c2a752e8b6cc5fb9337b4fe6e294d59687b1 with SHA-1 84c5c80441 is already in history

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

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