[automerger skipped] Merge Android 12L am: 9e740b678e -s ours

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

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

Change-Id: I7d3ba1bd21a05c47acc7afbb23422a6dfdfb1848