Android plugin contains duplicated, coincidently deactivated code

Much of the gradle handling code in the Android Plugin
https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/src/plugins/android/androidmanager.cpp#n619

Is very similar to gradle handling code in androiddeployqt:
https://code.qt.io/cgit/qt/qtbase.git/tree/src/tools/androiddeployqt/main.cpp#n2503

I believe it was copied from Qt Creator to Qt a while back and slightly diverged in the meantime.

Also, by coincidence, the manipulation of gradle files by the Android plugin got deactivated a few Years, ago:
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/444957

Shall the code in Qt Creator be re-activated? Or should it be removed?