Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77 am: 8ecdbfaafa am: 439cf37042

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: Iad1c9da61e897f1b0ff5cf24e40eb48845ef46cb

core/java/android/view/View.java

@@ -952,8 +952,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
     /**
      * Prior to P, {@code #startDragAndDrop} accepts a builder which produces an empty drag shadow.
-     * Currently zero size SurfaceControl cannot be created thus we create a dummy 1x1 surface
-     * instead.
+     * Currently zero size SurfaceControl cannot be created thus we create a 1x1 surface instead.
      */
     private static boolean sAcceptZeroSizeDragShadow;
 
@@ -30023,7 +30022,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
     /**
      * Dump all private flags in readable format, useful for documentation and
-     * sanity checking.
+     * consistency checking.
      */
     private static void dumpFlags() {
         final HashMap<String, String> found = Maps.newHashMap();