Update conflicting files

Update conflicting files with Connect-SDK-Android and Connect-SDK-Android-Lite

Author: jonghen.han

build.gradle

@@ -59,7 +59,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 31
     }
-
+   
     useLibrary 'org.apache.http.legacy'
 }
 

src/com/connectsdk/DefaultPlatform.java

@@ -45,7 +45,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest=Config.NONE)