Merge Android R

Bug: 168057903
Merged-In: Ic43dc2b316898ebb8e5505ce0c2d2908abad5fd2
Change-Id: If13e94e93e2beaf8e886b455c752b1e32cd3ceaf