Merge "Add APIs for configuring VPN automatic keepalive and IP versions"