Merge "Support exposing getNetworkSelectionMode" am: 2ac8306365 am: 8f35e3d93c

Change-Id: Id746911444336b294a501b6f5a42af5a67880f71