Resolve merge conflicts

Author: bleroux

shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java

@@ -11,8 +11,8 @@
 import android.content.ClipDescription;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.res.AssetFileDescriptor;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
 import android.os.Build;
 import android.view.HapticFeedbackConstants;
 import android.view.SoundEffectConstants;

shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java

@@ -31,8 +31,8 @@
 import android.content.ClipboardManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.res.AssetFileDescriptor;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
 import android.os.Build;
 import android.view.View;