[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 4625595c6a -s ours

am skip reason: Merged-In If7c143c2d2c887cd941aedbfdf874aeac7277638 with SHA-1 e6571e6d71 is already in history

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

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