Merge "Update AccessNetworkType for NR" am: 322f00e30f am: 39cf3d1de4

Change-Id: I062b9e464d072ea19b1ef9be5d48a1a23b3889be