Revert #734 (#736)

Reverts #734 due to not passing user acceptance testing.

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java

@@ -73,7 +73,6 @@
 import com.amazonaws.mobile.client.results.Tokens;
 import com.amazonaws.mobile.client.results.UserCodeDeliveryDetails;
 import com.amazonaws.mobile.config.AWSConfiguration;
-import com.amazonaws.mobileconnectors.cognitoauth.AuthClient;
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.util.CognitoJWTParser;
 import com.amazonaws.services.cognitoidentity.model.NotAuthorizedException;
 import org.json.JSONException;
@@ -91,13 +90,6 @@
  * A Cognito implementation of the Auth Plugin.
  */
 public final class AWSCognitoAuthPlugin extends AuthPlugin<AWSMobileClient> {
-    /**
-     * The result code for the activity manging the web UI sign in flow.
-     * This is needed for handling the response in the onActivityResult method of your activity.
-     * See the documentation for more information: https://docs.amplify.aws/lib/auth/signin_web_ui/q/platform/android
-     */
-    public static final int WEB_UI_SIGN_IN_ACTIVITY_CODE = AuthClient.CUSTOM_TABS_ACTIVITY_CODE;
-
     private static final String AWS_COGNITO_AUTH_PLUGIN_KEY = "awsCognitoAuthPlugin";
     private static final long SECONDS_BEFORE_TIMEOUT = 10;
     private static final String COGNITO_USER_ID_ATTRIBUTE = "sub";

build.gradle

@@ -51,7 +51,7 @@ ext {
     minSdkVersion = 16
     targetSdkVersion = 30
 
-    awsSdkVersion = '2.18.0'
+    awsSdkVersion = '2.17.1'
     dependency = [
         android: [
             desugartools: 'com.android.tools:desugar_jdk_libs:1.0.9',