Merge Android R

Bug: 168057903
Merged-In: Idfe5b27aaac2ad35cb2626afaf7d9ca5dca4ef4d
Change-Id: Ib50090d3776ab4a7877b3326c4fbe88e4890a7ee