Merge Android R

Bug: 168057903
Merged-In: I98721ca64d0d5eedd6380cc382bfdb527a7c1d9d
Change-Id: Ida5b8558ca08a581e05e362e54ce46980ec01bbe