[automerger skipped] Merge 10952656 am: 9c8cbb2482 -s ours am: 6e03e58ae0 -s ours

am skip reason: Merged-In I0ef64874797d2cb3a01eaa28d4e97e5691ba9bd7 with SHA-1 8baf8b51ad is already in history

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

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