[automerger skipped] Merge Android 14 QPR1 am: f93898e32e -s ours am: 4cda95d0bd -s ours

am skip reason: Merged-In I611902ed3d1588b743c1d58d176874aded5bbd85 with SHA-1 80d19f4133 is already in history

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

Change-Id: I3f8ab8011cf1547752f2a615919c5d64be33cdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>