Merge Android R

Bug: 168057903
Merged-In: I652dcff381201dac9ad1984809def239c64dfd40
Change-Id: I41fbc5e55c05f93d5d8e18cc9a79fa00b50e50d8