[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to...

[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: d74830e4 -s ours

am skip reason: Merged-In Icd55fe65c4afe84eb2bee4ae6ca1c1098a07fad0 with SHA-1 ade5e8dc is already in history

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



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