Merge Android R

Bug: 168057903
Merged-In: If51a5ba0ea5f35366841ffb44a10892da68905e4
Change-Id: Iba399ffc79b81d66812f887f5b0bffa867c78d0f