Merge Android R

Bug: 168057903
Merged-In: I4e01fbf5d6fd342573625b6e3ad0c2a387432920
Change-Id: Ibe1448b925ebe41ea8fa9ed4c76e5291df6bf2eb