Merge "Fix ConnectivityServiceTest for NATT Keepalive"