[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 3fec5d8276 -s ours am: bc1a8e5c91 -s ours am: b246c9543d -s ours

am skip reason: Change-Id Ic60d2d28c1488f6a602a8ac7b4268e722a0e386b with SHA-1 93f6d15b4a is in history

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

Change-Id: I21c48465b89aa45c895869656c8517c1acd81432