[automerger skipped] Merge Android 12 QPR1 am: fb8bbf98f8 -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: I3f7192c1c8c088b94c5f0ad65b6b35bc8d4b7d4e