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