[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 skip reason: Change-Id If031ceec4c449b2dd5a7f6516fa5faa3d880b144 with SHA-1 a1b6dd58 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I262469fd20012bdfecfab28aac41b281673951ab