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

Change-Id: Ib9aec9f24b7b81b56631f8a4a2ceaba8c6bb47e1