[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev am: b4b64ad602 -s ours
am:ee4db00d45-s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1df56995870is in history Change-Id: Icab5d7a43a26be9a4c2d01279453571062b2a808
This commit is contained in: