[automerger skipped] Merge Android R am: 9ab5c63fe2 -s ours am: 4a3e08bd79 -s ours am: ab6920e9cf -s ours am: 8c2476e530 -s ours

am skip reason: Change-Id I904a49116f122667bf0a0ac3017e718962cb1f2d with SHA-1 3fec5d8276 is in history

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

Change-Id: I15d07179630690a821de16af0ce3b67e731fc2eb