[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 0a19d853 -s ours...

[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 0a19d853 -s ours am: d6d829f9 -s ours

am skip reason: Merged-In I08772f7df3f3c78e2b7c94bcadce1e0784255a77 with SHA-1 e224e186 is already in history

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



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