[automerger skipped] Merge "Merge Android R" am: a51b1b85 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: a51b1b85 -s ours am: 9c782b4d -s ours am: 25527191 -s ours am: ecdd7bc3 -s ours

am skip reason: Change-Id I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04 with SHA-1 ab222e8a is in history

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

Change-Id: I4c01314b97e27bb9252ad3db3a563a208815db1e