Merge Android R

Bug: 168057903
Merged-In: Idc30a671f3fab9b67f82623cfe1feec44ac36a15
Change-Id: I462bb3b3ec6a8b6271e02355e8fb0a4414377493