Merge "Fix magnifier border isn't fixed when magnification is working" into rvc-dev

services/core/java/com/android/server/wm/DisplayContent.java

@@ -4934,6 +4934,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
                 scheduleAnimation();
             }
         }
+
+        @Override
+        boolean shouldMagnify() {
+            // Omitted from Screen-Magnification
+            return false;
+        }
     }
 
     /**