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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4cd48dfc -s ours am: a34b9731 -s ours

am skip reason: Merged-In Ie2f468b9b8ca85cbba055ccf3aa6bb0cd6de378a with SHA-1 ca03ff0a is already in history

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

Change-Id: I3193bd8841c3a4d199f72b4d6523ec6397e00261