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

Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
tree: db8246d28e8d6377b7aff62adca01020d4e1215f
  1. core/
  2. services/
  3. tests/