[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am: 9f98789d3f -s ours
am: a8056e3fb8 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history

Change-Id: I020ffc31fb0ef41332df37110bb0a8b01e76c976