Merge "Fix service name for VPN_MANAGEMENT_SERVICE."