[automerger skipped] Merge "Add 5G NSA information" am: 4d939359dc am: d0fa3857bd
am: f034abe44a  -s ours

Change-Id: I0ae80135234271df9d0d6f3864212bd6cc0f6d38