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