Merge "Update VPN capabilities when its underlying network set is null." am: e3ae238f am: d6d59357 am: d5444c9e Change-Id: I6dd5a369f1a3b74bbf498051ef1e4d1b31bd8e5e