[automerger skipped] Merge Android 14 QPR1 am: b454fe7937 -s ours

am skip reason: Merged-In If9d9e69ac0255ffb503b9e2a067f7be81ed6c139 with SHA-1 fe93969af2 is already in history

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

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