Merge Android R

Bug: 168057903
Merged-In: I304c9380ef53b720858f4b094addf677f06c8e99
Change-Id: I82550683d6a20c02dfc2d0b0ac7f2923cf5d6873