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

Change-Id: I832cbc4646c010add5a4f051d3f7151cfc94120c