Merge Android R

Bug: 168057903
Merged-In: I76c7b62b7500c6af1fcfca614958c0993d921528
Change-Id: Ia5292c9546da8e4586b813ffa2a69edb6e35bd8f