Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into...
Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f am: f5464121" into nyc-mr1-dev-plus-aosp
am: e521d70d
* commit 'e521d70d':
Change-Id: I90c50af4bb32623a81723ed059692b8b9ff6b5cf