Merge Android R

Bug: 168057903
Merged-In: I9442538fdd0e5c1b7ad7b31dae5d175e292818ea
Change-Id: Ia25c9ea584a7577ab02f805ff73fc98329bad1ea