[automerger skipped] Merge Android 14 QPR1 am: c62ec3e614 -s ours am: 96732eec53 -s ours

am skip reason: Merged-In Ieb446f4d7d6c7c8e8d320fb04cb856eeef983873 with SHA-1 9c8cbb2482 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2865656

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