Merge "Add NETWORK_TYPE_NR to Telephony framework" into qt-qpr1-dev