add Tag and VpnDialogs from AOSP
framework Fixed