Merge Android R

Bug: 168057903
Merged-In: I688cf9a8010c1def4043e5b1caa819dbf18da5f4
Change-Id: I4889d325202b6da35685631e0a92fad599fa138b