Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev