Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b
am: f5464121c0

* commit 'f5464121c0050bd8926f243a7f84fcc3282864d5':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I79e1c6ecc0a107db616e3bdf0aff50b4358a8373