[automerger skipped] Merge 24Q4 into AOSP main am: b8d5b528 -s ours

am skip reason: Merged-In I9a0a0344ea49b0ef050834f418fdfa16d4e4375e with SHA-1 6b1060f0 is already in history

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



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