Merge Android R

Bug: 168057903
Merged-In: Ib76a3f938a240498c6201b01f8b1281624618038
Change-Id: I0470fcebdd6d5921b8d9e6e3ee55f9b72c8c695e