Merge Android R

Bug: 168057903
Merged-In: Id6af168a8a5712ecfdc4d231bae368a75a66757b
Change-Id: Icbfd4b06bb6b5cc57bc2990b41158df00261233a