Merge "Update VPN capabilities when its underlying network set is null."
am: e3ae238f4a

Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe