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