[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a -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: I78bc888c7d0a21fbb68d135732c08f900e8f1c83