Merge Android R

Bug: 168057903
Merged-In: If8a54f7b1c59104c0065820e67eb5f1038bcb8eb
Change-Id: Ic0d2d960cabf9355118f6984bfd6ce8bb0805d20