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

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 762b8cd8 -s ours am: 637cb34e -s ours

am skip reason: Merged-In Ib07dfe90802f049233f1cc1a6185f4a7de650346 with SHA-1 cbf91ee8 is already in history

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

Change-Id: I4f3a0b7fe8894f15e8caa6c9b26120f3a53d278f