Merge Android R

Bug: 168057903
Merged-In: I4279cc6ac8e47f741767bcaeef57de45d3262361
Change-Id: I63c439e85e13058f0fd097ccc5d0f1f0f7de6fb5