Merge Android R

Bug: 168057903
Merged-In: Iac885e1070f3f72af7b64b13e7046eed90e01eb8
Change-Id: I93b65e398c58acc8b78937818d5fb636e25757eb