Merge "Add 5G NSA information" am: 4d939359dc
am: d0fa3857bd

Change-Id: Ib6fee0e7507e095bb734778651db789ae06e43f5