[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: a532c858 -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: a532c858 -s ours am: 25b274b2 -s ours am: 513bc914 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7972fe7d47f8584295844602eafee11158ad22f