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

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

Change-Id: I7a44158b41c20d297e3e1c2869bb0a58549e84a2