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

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

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

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