Merge Android R

Bug: 168057903
Merged-In: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
Change-Id: I9e9ef6fa29d6bc519b7c57ad4c3e26c5adf1c08b