Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5

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

Change-Id: Id6bfe506a96e2abeae8a3f6dd1c61f4b4873e397