Merge Android R

Bug: 168057903
Merged-In: Ia5b583d0d3196a63cbefc54597783416d64832e0
Change-Id: Ie10dfd4b93fcd18902eb72e13b86e92fb58ce42b