[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: c08b383866 -s ours am: f461e8c526 -s ours am: 65ffb4102a -s ours

am skip reason: Change-Id Iaee18ba48fc5a8ec511074dd10d69c383e92583b with SHA-1 9963fbe1af is in history

Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1421707

Change-Id: I0a73c7838918a612f6d26e21548771c0fe831d47