Merge Android R

Bug: 168057903
Merged-In: I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc
Change-Id: Ic98265603b0e54f50c2acfab9e4e4149a090ef69