Merge Android R

Bug: 168057903
Merged-In: Ic0ab86ded3598e18745fa9f82b3ece88d629de91
Change-Id: Ieaf4ea57cae4101b2810ea97daf77bfdbc0baf85