[automerger skipped] Merge "Add NETWORK_TYPE_NR to Telephony framework" am: 00cb7eae
am: 00acba2b -s ours
am skip reason: change_id I88e3a19ef428505289dffb0d04f47fe3af1f078a with SHA1 308a4c56 is in history
Change-Id: I0a3ab0bd3f7fbda586a96e841b812666a8d4987c