Merge Android R

Bug: 168057903
Merged-In: I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f
Change-Id: I5b3124625a3c393fc507a76366f463c3d9e711ab