Merge Android R

Bug: 168057903
Merged-In: If3301aad7610ef3d2472fcc677e9e89510fe652e
Change-Id: I0477925117f37d87f97b9f569494edb6b09b04d3