[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 148c8053c3 -s ours

am skip reason: Merged-In Idba9e739f022db46f4cb8bc5058a4a51af2ce671 with SHA-1 fad9449c97 is already in history

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

Change-Id: Ic10350086989aea7090c208b8b8d33733926a315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>