Merge Android R

Bug: 168057903
Merged-In: I624489eaaf6df7bce7c65b31ace07d90f99a0c89
Change-Id: I952a401bf8582e0c627738f167e564aee252cb42