Merge Android R

Bug: 168057903
Merged-In: I22ea459266eeb88509fefb34277e6426166e2502
Change-Id: I61f0ddc32a51997cca143ec58d0a6b08453a8b32