Merge Android R

Bug: 168057903
Merged-In: I51411eabdf7f95382b4049a26f261b6d7af9aa86
Change-Id: I55f93dcc355b243cdef811c516abdfcc368b255a