Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile"