[automerger skipped] Merge Android 12 am: 961085a273 -s ours

am skip reason: Merged-In I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history

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

Change-Id: Ic612d1b754dca1ce9316d6e0d50a7d27ff4c75a2