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

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

Change-Id: Ia65972e192adc0da0403bd0ff317da180c2432a0