Merge Android R

Bug: 168057903
Merged-In: Iaee18ba48fc5a8ec511074dd10d69c383e92583b
Change-Id: Ie95a9023e5a251cbb5414b16adb92c1dd8ee1e9a