Merge "Change NETWORK_TYPE_5G_NSA reference package"