Merge Android R

Bug: 168057903
Merged-In: Ifb8126ec6c2ae6e79afc1a0cc620dc2f062df96d
Change-Id: I84f64fb87e6c7fef276445e5e3bf0ab41ec94005