Merge Android R

Bug: 168057903
Merged-In: Ieb0746ea38172666412d8de3fd08ab89c3590d0c
Change-Id: I3ab49f50f04a123a2c7b5ebb870e5835ff6d082b