[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 78c0048d -s ours am: dfafe17c -s ours am: b1f5d77a -s ours

am skip reason: Merged-In I1b7c07dbf6e15baa783199aff5d299859c838ba2 with SHA-1 2b638233 is already in history

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

Change-Id: Ic00c38ba043cbabbab18297516560a240f9e7026