Merge Android R

Bug: 168057903
Merged-In: I5d7809cf7ab2c26f22ad34434bfd997baed6e327
Change-Id: I451b7e922a1bacb4c6940a66d4fbc18a6ed43280