[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am: 376b30f985 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
tree: cf4ecf4dcc4bc51fef10988c834fc31f23cdd87c
  1. core/
  2. services/
  3. tests/