Merge Android R

Bug: 168057903
Merged-In: I349663519ef1c6b0644245e35850b19eb6ce3bab
Change-Id: I652ef28d14f5450a60557a1d41504fe47c319dcb