Merge "[automerger skipped] Merge Android 13 QPR1 am: adbc8c74 -s ours" into...

Merge "[automerger skipped] Merge Android 13 QPR1 am: adbc8c74 -s ours" into stage-aosp-master am: 8a373807 -s ours

am skip reason: Merged-In I25c4efdb73dc5eb88611efac669de13fa2be0c3d with SHA-1 9a9c7c18 is already in history

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



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