Merge "Exposing getNetworkSelectionMode" am: e09eaa0c11 am: dca9f60797 am: d4dad8ca2a

Change-Id: Ic2b4c98bcf30b4d043f46400a44860f8d45353ca