Merge "[Telephony] Clean up: remove getApnTypeStringInternal" into sc-dev