Commit 25b274b2 authored Dec 10, 2020 by Xin Li Committed by Automerger Merge Worker Dec 10, 2020

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: a532c858 -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: Ied7a39f34a7bf7e4b68bd11af22f6058b319b901

There are no changes