[automerger skipped] Merge RQ2A.210305.007 am: 7fc91c94fc -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: If13ed377c42533b7fdf0e6e3b7d8ee6bc7ab2e47