Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 am: 7cac3f3286 am: 60942b60eb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305

Change-Id: I3609e75c518400178e234aa3c78684abba495d50