Merge Android R

Bug: 168057903
Merged-In: Ie7cb70566695de61c3605b1b279dff6b65275601
Change-Id: I6f755c0e8df401a65273b7484b5bbaf3aa719aa7