[automerger skipped] Merge "Merge Android R" am: e109a7fe68 -s ours am: 4af33b353f -s ours

am skip reason: Change-Id I7cd4345e89ff7914cdf64d33f798c47d1169e3a3 with SHA-1 c2b945ddfa is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1422568

Change-Id: Ia5786f4c4bdedc40161946152fe3f8dce0c65e28