Merge Android R

Bug: 168057903
Merged-In: Ia0aab815bfc9969cb36a6380158fe7dbafcae4f3
Change-Id: Ie30e66a93152715b9c1e28b17e999733c77664f8