Merge Android R

Bug: 168057903
Merged-In: Ide482c0b5b58c9b846a1bb9f33a870f77be7b551
Change-Id: Ib1881c8c913b0d66e6d5050cb4ba378530ffe05f