Merge Android R

Bug: 168057903
Merged-In: I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68
Change-Id: I0586c24e16b7d052b0d209e2dffd6124492fcafa