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

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

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

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

Change-Id: I92d55a9f24cc4c7359351b1c300677137ab764e4