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

Change-Id: Ib10600dbb1fed7c3749bfb6c0ee634093806843e