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

Change-Id: I416c61f79b2dd32f1a3c684b5e371dccb3b8e8d9