Merge Android R

Bug: 168057903
Merged-In: Ieb1e215ffec643fcbb95c11873f0de07ebeb450b
Change-Id: I0df9ee9da5c3da1dd054896f9ed3acf53d084811