Merge Android R

Bug: 168057903
Merged-In: I8f8254a06d6b6fdb726dbe8bcc162ef5a99fc546
Change-Id: Ief6ce532c49fdf84f572575f20ad92e6f99d464e