Merge "Add NETWORK_TYPE_NR to Telephony framework"