Merge Android R

Bug: 168057903
Merged-In: I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16
Change-Id: I5e0175f0c78fe089047e31c1cbd88bba0914a407