[automerger skipped] Merge "Add NETWORK_TYPE_NR to Telephony framework" into qt-qpr1-dev am: c60e032391
am: 2b4b00af6c -s ours
am skip reason: change_id Iaed46354400c7a1ce410eebc246892d7edf448dc with SHA1 080b210f0e is in history

Change-Id: Iab5ac6aa480156c04999d2d70adf45e079bf7bef