Merge "Add NETWORK_TYPE_NR to Telephony framework"
am: 65cdc9dd68

Change-Id: Ic04b0663e4d3700f1a624034bb1a25610e555e25