Merge Android R

Bug: 168057903
Merged-In: Idf66ef4bfe1b40cbfe6ff8d29bcfe33b1ea2f643
Change-Id: I3e54dc92149b436d64560e20028d872d14b1b437