[automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours
am:53b66bee29-s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1273f900b3bis in history Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
This commit is contained in: