Merge Android R

Bug: 168057903
Merged-In: Icdac6de452cfb91db7fa31eb9f5633fd2372f22a
Change-Id: I96a0d7095b05fe1b3fa4d23c99df2e5bf0b069c3