Migrate Android device administrator Tap Scheduler (GMS enabled) to Android Enterpise to

Hi All,

I am looking for some information on migrating Android device administrator Tap Scheduler to Android enterprise. We had to enable GMS option at the time of enrollment as it didnt let us enrol unless the option was enabled.

As per below article, will the support for teams panels like tap schedulers will be ending on 2025 September? Or as GMS is enabled will it be ending in August 2024?

https://techcommunity.microsoft.com/t5/intune-customer-success/microsoft-intune-ending-support-for-android-device-administrator/ba-p/3915443 

I tried the traditional way of creating the compliance policy and setting the device platform restrictions to block device administrator. However there was no option  to resolve the compliance like how we get on regular Android device. Any idea if we still can migrate the device to android enterprise through this way? Or Is it the ASOP, the way forward?