Merge Android R

Bug: 168057903
Merged-In: I3d0e4b04c67649f009c8a5b98bafd71e3f249e91
Change-Id: I4ab8220a468270426349763c66e3608e1c77d644