am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev

* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.