Merge "[Telephony] getDataNetworkType() uses incorrect subid"