[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 692092630e -s ours

am skip reason: Merged-In I39640de1922b2439b8c4bb11cb6f70d5e0e7e218 with SHA-1 60fa22dae0 is already in history

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

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