Merge Android R

Bug: 168057903
Merged-In: I6572157ab6f75fefb67d7fbc24e9529df8c17743
Change-Id: I842cc3fb1a04166a28b0d778318b822c4b03214f