Merge Android R

Bug: 168057903
Merged-In: I0d44970326f4c8391459d98140f817235816759c
Change-Id: I0a8d7976dc5807c15e847f4e8a1f37aa1ed2ec4e