Merge Android R

Bug: 168057903
Merged-In: I5fcf38b16c81c6b75624936a4f98e37bdb871340
Change-Id: I216d73fe12fd68c09c94dd731b75418882c2b9c2