Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 am: 27fba62481

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

Change-Id: I74caa2dd5fc99a5804b470c082ba05791cf3ed36