[automerger skipped] DO NOT MERGE - Merge Android 13 am: 53fb351266 -s ours am: 6e49abc00c -s ours

am skip reason: Merged-In I84ad65b397ac38f30f2a4a8ad8ba384fbb50abdb with SHA-1 3c778d5d37 is already in history

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

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