Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev