[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b9595f8b -s ours am: 847043ab -s ours

am skip reason: Change-Id I0bbfa9c7755bc44a125a01aafe7d6ad7bb64fa1b with SHA-1 30e793ae is in history

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

Change-Id: Id9afb2491f5772cc289c01a95a7910a29eac6614