Merge "Add API for proxy configuration over VPN."
am: 8b5917965d

Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd