Merge Android R

Bug: 168057903
Merged-In: I6915eba4e24ab91402540f89abbfc871b96e5d16
Change-Id: I44b938cbc8ec61d97d351383c6651a1e4ba8e4c2