Merge Android R

Bug: 168057903
Merged-In: I3a68890be6d2c62299703dea85b8aad11771e5bc
Change-Id: I2a6db130c8057ccdda76ad04f16b4b0dd9bbf6aa