[automerger skipped] Merge Android 13 QPR1 am: adbc8c74 -s ours am: af94f07a -s ours

am skip reason: Merged-In I25c4efdb73dc5eb88611efac669de13fa2be0c3d with SHA-1 348b8b74 is already in history

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



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