Merge "Exposing getNetworkSelectionMode"
am: e09eaa0c11

Change-Id: I5087bda773f4b8607c16e46bd0cdbcc187711470