Merge Android R

Bug: 168057903
Merged-In: I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc
Change-Id: Id6e38ad638ffc856e26b8b1935c16f077dbd82c4