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

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

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

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



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