[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 9139562a71 -s ours

am skip reason: Merged-In Iee49ffd94ac72ef063a8478735232829d06469d8 with SHA-1 b1da27d6a3 is already in history

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

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