Merge Android R

Bug: 168057903
Merged-In: I5667593cf89e4432861a5033ea57281507ddce74
Change-Id: Icb2a984c9d631291971f5e5f3961b0797371cbf2