Merge Android R

Bug: 168057903
Merged-In: I4c6584a78c1296b9fe65edeafe7aba3f143f3b56
Change-Id: I8d4c38105bb5d4d48051cd0e15c500af3bf8e876