[automerger skipped] Merge "Add NETWORK_TYPE_NR to Telephony framework" am: 65cdc9dd68 am: 19bf33190f -s ours
am: 942e63d3bc -s ours
am skip reason: change_id Iaed46354400c7a1ce410eebc246892d7edf448dc with SHA1 06b97e2a38 is in history

Change-Id: I092b045ce31c5fd8d51490061bd4cf6d1aa517af