Merge Android R

Bug: 168057903
Merged-In: I1b25ac53a5929017ba076e1b79d202d73a319d28
Change-Id: I106ef0086754e8f1d139b05346bdb507d0cb277d