Merge Android R

Bug: 168057903
Merged-In: I2e910257538c52e37e67ca9fe884daa80219415b
Change-Id: I8c0d0d504210c2a6cbecb42d23d38f9aba32d9ac