Merge Android R

Bug: 168057903
Merged-In: I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d
Change-Id: I68140ef190682d8ddfb176ceca1f479d56a814b1