Merge Android R

Bug: 168057903
Merged-In: Ib83cd87683ae896de789cdf6cd0c801562a191d5
Change-Id: Ib59d0e80d25043ccabf64e63c4b2765ee012851b