Merge Android R

Bug: 168057903
Merged-In: I58746745416a0abfe332709351ed21a99f5abd3b
Change-Id: I5405f2f357fbfd687762c9326a7b64fae60b79d4