Crop touchable region to surface bounds when updating an InputChannel

This reverts some logic for setting the touchable region that was made
in ag/17050822.

Bug: 254681548
Test: presubmit
Change-Id: I929dd28c782992445882a2d61105aa3e5a0a99bc
(cherry picked from commit 3823c8c062)

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

@@ -8684,11 +8684,12 @@ public class WindowManagerService extends IWindowManager.Stub
         h.ownerPid = callingPid;
 
         if (region == null) {
-            h.replaceTouchableRegionWithCrop = true;
+            h.replaceTouchableRegionWithCrop(null);
         } else {
             h.touchableRegion.set(region);
+            h.replaceTouchableRegionWithCrop = false;
+            h.setTouchableRegionCrop(surface);
         }
-        h.setTouchableRegionCrop(null /* use the input surface's bounds */);
 
         final SurfaceControl.Transaction t = mTransactionFactory.get();
         t.setInputWindowInfo(surface, h);