Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040 am: 09aa059ec4
am: c97f2a7c71

Change-Id: Ib0d3fea2da62271ff7e9fc92738ae4b0a1270182