Merge "Add a VpnManager.TYPE_VPN_OEM."