Merge Android R

Bug: 168057903
Merged-In: I904a49116f122667bf0a0ac3017e718962cb1f2d
Change-Id: I01747fa3ade1da0a5b2a726a000013a49206972f