am 30ece34c: Merge "Set network type to ro.telephony.default_network if hiding preferred network type" into mnc-dr-dev

* commit '30ece34c14768bce32ff42f7484e35c9aa25b013':
  Set network type to ro.telephony.default_network if hiding preferred network type