Merge "Exposing getNetworkSelectionMode" am: e09eaa0c11 am: dca9f60797

Change-Id: If9af50351df220772a9e46780c43a452ec352321