Merge alias branch into release branch for 6.2.0 (#2329)

See title.

---------

Co-authored-by: Azure DevOps Pipeline <[email protected]>

Author: shahzaibj

changelog

@@ -2,6 +2,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
 
 vNext
 ----------
+
+Version 6.2.0
+----------
+- [PATCH] Update common @21.4.0
 - [MINOR] Update AGP Version to 8.1.0 (#2254)
 
 Version 6.1.1

common

@@ -189,12 +189,12 @@ task sourcesJar(type: Jar) {
 
 // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-def commonVersion = "1.0.+"
+def commonVersion = "21.4.0"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "1.0.+"
+def common4jVersion = "21.4.0"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
@@ -310,16 +310,16 @@ afterEvaluate {
     // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above)
     // Adding this work around to have the file properly renamed.
     // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL.
-//    tasks.named("assembleDistRelease").configure {
-//        def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
-//        print "Build file $buildFile"
-//        doLast {
-//            println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
-//            if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
-//                println "Rename failed!"
-//            }
-//        }
-//    }
+   tasks.named("assembleDistRelease").configure {
+       def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar")
+       print "Build file $buildFile"
+       doLast {
+           println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'"
+           if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) {
+               println "Rename failed!"
+           }
+       }
+   }
     publishing {
         publications {
             msal(MavenPublication) {

msal/build.gradle

@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=6.1.1
+versionName=6.2.0
 versionCode=0