Merge Android R

Bug: 168057903
Merged-In: I05bf001a541c36cea285a3ee33b0ede8403c271d
Change-Id: Iea0b3727d5b1720368618628bc7c53517ea4a9bf