[automerger skipped] Merge Android 12L am: 524748a371 -s ours am: abdf9ae1d1 -s ours am: d49534499b -s ours am: 0158c0ced9 -s ours

am skip reason: Merged-In I41b0f264d344daeb60050231160084c448083f16 with SHA-1 2bac0b4304 is already in history

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

Change-Id: I259a30798c409f168a1c6fe34ed461834e7e3e88