Merge changes from topics "getApnTypeString", "qns_switched_pref"

* changes:
  [Telephony] Clean up: remove getApnTypeStringInternal
  Disallow data when QNS switched the preference