Merge Android R

Bug: 168057903
Merged-In: Id41e3ef8bd7d4487a754f33d25ff00e69633adc9
Change-Id: Ie718e7adfe2a63a6b0b82c5900ff7ab24aec505c