Merge Android R

Bug: 168057903
Merged-In: I0b680ac97ee447483de5b99ffa30a9b8d5c02d41
Change-Id: If6cfdea13b18a5b760e9469c4c1d56d4d98bcea0