Bug 1856399 - Use distinct version code in Fenix AAB (#3919)

* Bug 1856399 - Use distinct version code in Fenix AAB

* Bug 1856399 - ensure aab version > apk version for given time

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

app/build.gradle

@@ -280,9 +280,10 @@ android.applicationVariants.configureEach { variant ->
             def abi = output.getFilter(FilterConfiguration.FilterType.ABI.name())
             // If it is a Mozilla Online build, use a unified version code of armeabi-v7a
             def arch = (isMozillaOnline) ? "armeabi-v7a" : abi
+            def aab = project.hasProperty("aab")
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
             // channels that never shipped a Fennec build.
-            def versionCodeOverride = Config.generateFennecVersionCode(arch)
+            def versionCodeOverride = Config.generateFennecVersionCode(arch, aab)
 
             println("versionCode for $abi = $versionCodeOverride, isMozillaOnline = $isMozillaOnline")