[automerger skipped] Merge Android 12 am: 87db8348 -s ours am: 3765ceb1 -s...

[automerger skipped] Merge Android 12 am: 87db8348 -s ours am: 3765ceb1 -s ours am: 754e658b -s ours am: 2b638233 -s ours

am skip reason: Merged-In I90187609ee9ba51bca7036a89ce46f1c08bbf1b3 with SHA-1 4cd48dfc is already in history

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

Change-Id: Iac4502c275cb758bef28ec90bd25b18201c191ec