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

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

Change-Id: I6b2448929abed69b22483dce6b2c9277cb91f97d