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

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