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

Change-Id: I3d2f5c5a7bc199551aad1ddb656dc076e3121fb3