Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev