[automerger skipped] Merge Android 12 QPR1 am: fb8bbf98f8 -s ours am: f60a5d7e44 -s ours am: c3393d610f -s ours

am skip reason: Merged-In I7b1ca7d71f18b16fa6db39ba556eb1106746c83b with SHA-1 78c0048d82 is already in history

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

Change-Id: Ieb7e81eb6a7e9491bb092118ef0794a7d65d9939