Merge Android R

Bug: 168057903
Merged-In: I326820c4a876960b20b9fad780399cd4c451b6c5
Change-Id: I985e47f85281fb1810a1b3fa4bd69fe46be4d2fe