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

Change-Id: I08f5f69168f58318afb0fd848a8177319018356a