System tablespace autoshrink fails with "User table exists in system tablespace" error due to legacy SYS_DATAFILES and SYS_TABLESPACES tables

Description:

We're using the `autoshrink` option of the `innodb_data_file_path`, but after each restart, we encounter the following message:

User table exists in the system tablespace.Please try to move the data from system tablespace to separate tablespace before defragment the system tablespace.

Root Cause Analysis:

After detailed inspection, I found that the tables SYS_DATAFILES and SYS_TABLESPACES still exist in our system tablespace, although these tables should have been removed according to this commit: https://github.com/MariaDB/server/commit/5407117a59a87a1e0042581bc9c258cd2e743c85
The issue originates in the code here:
https://github.com/MariaDB/server/blob/mariadb-11.8.5/storage/innobase/include/dict0dict.h#L1508
This statement ignores the IDs of these tables during the check. This would not be a problem if these tables were not present in the system tablespace.

Environment:

Our project has been using MariaDB for years and has been continuously updated through multiple versions. I attempted to locate a migration script responsible for removing these legacy tables, but either such a script does not exist, or it was missed during previous upgrades.

Expected Behavior:

The autoshrink operation should complete successfully without errors.

Actual Behavior:

The autoshrink operation fails due to the presence of legacy system tables.

Question:

Is there a documented migration procedure or upgrade path that should have removed these tables? If so, is it safe to manually remove them now, or should there be a fix to handle this scenario gracefully?