Merge Android R

Bug: 168057903
Merged-In: I08ba9038c15f54bf2313b1a741b49b239480c21a
Change-Id: Idab591b719499b2978af26fdd4a592814f581973