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

am skip reason: Merged-In Ic51e440ebfe679a9b98a84fb454e250588761faa with SHA-1 42cbaf8b27 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/3413285

Change-Id: I56a8fb0ddd237b9c68778dcd2a7936cdc2e5d414
Signed-off-by: Automerger Merge Worker <[email protected]>