[automerger skipped] Merge "Merge Android R" am: 0943187c84 -s ours am: c08b383866 -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: Ib3bc90b76f92522be94dcd5834673a2de144f8c5