[automerger skipped] Merge Android 12 am: 87db834851 -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: I6a0f0a61191d08c9e1908236008711d4747dd472