Cherry pick common#2354

fadidurah wants to merge 2 commits intorelease/7.0.2AzureAD/microsoft-authentication-library-for-android:release/7.0.2from

working/release/7.0.2AzureAD/microsoft-authentication-library-for-android:working/release/7.0.2Copy head branch name to clipboard