[automerger skipped] Merge Android 14 QPR3 to AOSP main am: c6ef8d0881 -s ours

am skip reason: Merged-In I44b3b98907f981f2a436d2021f28e40d8ef70c70 with SHA-1 b480e36a23 is already in history

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

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