[automerger skipped] Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef" am: 54d74bbf06 am: 28b34fac22
am: f37194e1ba -s ours
am skip reason: change_id I4bec8de081efe1020409351afa284fd2e69a25b5 with SHA1 af741e2424 is in history

Change-Id: Ib26d4b06663583acbf20683dac38ecf0c48e7933