[automerger skipped] Merge 24Q3 to AOSP main am: 71dccba2e7 -s ours

am skip reason: Merged-In I87e0918602e9fd989d5278f06d439d5b44a66190 with SHA-1 5628bb3d52 is already in history

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

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