Bug Cannot build for Android 11(API Level 30) - Unity 2019.4

Hi there,
We use some third party Unity plugins that targets to Android 11(you can try with newest Firebase Unity SDK).
We got build failed with the following error message:
"Android resource linking failed /Users/sample/AndroidStudioProjects/MyApp/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml:18: error: unexpected element <queries> found in <manifest>".
The Unity version I used is 2019.4.16f, I went to temporary solution to use external Gradle to work around it, but it's not in the long term, because it'll not work on the Unity Cloud Build.
I'm not sure this issue is going to happen in Unity 2020.x or not. Do you guys planing to upgrade Gradle to newer version to fix this issue on Unity 2019.4.x?

Here is the work-around solution: https://developers.google.com/ar/develop/unity/android-11-build