[automerger skipped] Merge 24Q3 to AOSP main am: cf83cce157 -s ours

am skip reason: Merged-In I4ac76e6ebd8fb178b12657bd2f505dc2b719e933 with SHA-1 f8b0d9d579 is already in history

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

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