[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 9f16f41671 -s ours

am skip reason: Merged-In I53aed938df1396e03c37444144a7d926db40d445 with SHA-1 fe6a3d2694 is already in history

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

Change-Id: I36378e3a137ae7c25880e5dd91945330990c185f