[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: a1b6dd58 -s ours am: 54657821 -s ours

am skip reason: Change-Id I527097ba19414c3ed99606f95276ff506cfb4ec2 with SHA-1 3f563648 is in history

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

Change-Id: Ie5f07bc14a5d4c23c7a77356420ba14f3c11fb38