am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev

* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog