[automerger skipped] Merge Android 12 am: 87db834851 -s ours am: 3765ceb17c -s ours am: 754e658b22 -s ours am: 2b638233f0 -s ours am: d5f6e79a0f -s ours

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

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

Change-Id: I6a485e1f6d33f656abc51d1ec10d233d0fee694a