Merge Android R

Bug: 168057903
Merged-In: Ia45f259338a1f8255e22c7ba6125e8149eaa9081
Change-Id: I780a337f81956c8fb9b33b2034e62f89ac3cf3e0