Merge "Update AccessNetworkType for NR"
am: 322f00e30f

Change-Id: I5bd216d080abca87efb14e7e3d201a3ca08bc7d1