Merge Android R

Bug: 168057903
Merged-In: I0c289e2d8e105a8572c49d24bb880918f08b2f0e
Change-Id: I743525a1cf8a640f858eae6aa5368bbc749f8c3c