Merge "Fix legacy APIs when VPN switches to suspended underlying network."