Merge Android R

Bug: 168057903
Merged-In: I76a40f211cb9022b7ee1c372266c8cc1e2537e57
Change-Id: I0e116f3777af27d0e768ac234e4cc97b23fe23f8