[automerger skipped] Merge Android 12L am: 9e740b67 -s ours am: a50c5378...

[automerger skipped] Merge Android 12L am: 9e740b67 -s ours am: a50c5378 -s ours am: 86fce639 -s ours

am skip reason: Merged-In I12eec8d7027f6b175826017e35b0d4b9375ea195 with SHA-1 762b8cd8 is already in history

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

Change-Id: Idf5621c17b8e96ce83001758ade901164f89644e