Merge "Update VPN capabilities when its underlying network set is null."
am: 9e226700d9

Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe
tree: ee491f8a0e350170f9a8ddf99a7160adacad8491
  1. core/
  2. services/
  3. tests/