[automerger skipped] Merge Android 14 QPR3 to AOSP main am: e8b1ba3d -s ours...

[automerger skipped] Merge Android 14 QPR3 to AOSP main am: e8b1ba3d -s ours am: 7cf103af -s ours

am skip reason: Merged-In I0cfb65cf9c91aab3b18a36ae81f0a73d9d0ff6e3 with SHA-1 d74830e4 is already in history

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



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