Merge Android R

Bug: 168057903
Merged-In: I6a8acb690e153838070951963797f69d92e58c1e
Change-Id: I9022df47693f05cfd6eb55224d7b4517686da0ba