[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 7ecb3dd25a -s ours am: 465e879ab0 -s ours am: 738feb52cd -s ours

am skip reason: Merged-In Ia1ffcc2c8210209a002835e8a117ef0b8db8185c with SHA-1 40bb23ca3a is already in history

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

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