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

Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd
tree: ca6d1f730ccd0aafce7213ad288e94e7ad5f23bf
  1. core/
  2. services/
  3. tests/