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

Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6