Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: f5464121c0" into nyc-mr1-dev-plus-aosp
am: e521d70dfa
* commit 'e521d70dfa67cff36f2b34eb3cfe74113a47d587':
Change-Id: I90c50af4bb32623a81723ed059692b8b9ff6b5cf
This commit is contained in: