Merge Android R

Bug: 168057903
Merged-In: I941272023ad401c3b4d5e4bfa17a0e6080331cf7
Change-Id: I1021925164a8e1d6886a1b0acd12d44ea08b5638