[automerger skipped] Merge 24Q3 to AOSP main am: 4509e40e65 -s ours

am skip reason: Merged-In I46302d5af424e666e2f666478afe9adf2b480b65 with SHA-1 8a0bee1ab1 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/3258023

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