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

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