Merge Android R

Bug: 168057903
Merged-In: Ia1df46118f3467b12bd0fcb06dbb32772d95720b
Change-Id: I1ac6f22b974786909eee8b8a0e7c516c303eb578