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

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