Merge Android R

Bug: 168057903
Merged-In: I8a367b1dd392f1a40c1805bc0589c7dfb6b2d080
Change-Id: I9510eec3eadd4e734b2ab2d43f9cfe2600b03415