Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev...
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f am: d6d2497e
am: 0075bf31
* commit '0075bf31':
Finish ConfirmDialog when another vpn app is always-on
Change-Id: Ia65972e192adc0da0403bd0ff317da180c2432a0