push down: preserve @Override if keep abstract was selected (IDEA-155600)

java/java-tests/testData/refactoring/pushDown/PreserveOverrideAnnotationAfterConflict.java

@@ -0,0 +1,18 @@
+interface Test {
+  /**
+   * some javadoc
+   */
+  default void foo() {
+    System.out.println("I");
+  }
+}
+
+class C implements Test {
+  /**
+   * another javadoc
+   */
+  @Override
+  public void foo() {
+    System.out.println("C");
+  }
+}

java/java-tests/testData/refactoring/pushDown/PreserveOverrideAnnotationAfterConflict_after.java

@@ -0,0 +1,16 @@
+interface Test {
+  /**
+   * some javadoc
+   */
+  void foo();
+}
+
+class C implements Test {
+  /**
+   * another javadoc
+   */
+  @Override
+  public void foo() {
+    System.out.println("C");
+  }
+}