[automerger skipped] Merge Android R am: 8854587231 -s ours am: 803d9f6e61 -s ours am: d9b3869e14 -s ours am: d9f878356e -s ours am: 1dc522187e -s ours

am skip reason: Change-Id Icdb90bf3af72f16e59dee05fea2b4911750a8243 with SHA-1 b9595f8b0c is in history

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

Change-Id: Ie37855fe8753ce71415dcd98996c53883920eb29