[automerger skipped] Merge RQ2A.210305.007 am: 7fc91c94fc -s ours am: fac27cd8e3 -s ours am: a41d894e3d -s ours

am skip reason: Change-Id I5c36ecbac4c423627c8cab1b65a6e77bde5bd55b with SHA-1 d3063e9ef3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id958157005b25481c6e93da3a9cd96e125750eca