Merge Android R

Bug: 168057903
Merged-In: Iaf511a01e9a73da3d82251eae2ea49f39f78627d
Change-Id: Ie133933bdb9e7b7bc4d432cd0d19733f2aab9f07