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: I5c61e698271f010416dc2b061e14c62fe86255b8