Fix custom pointer icon caching in ViewRootImpl

Currently if the pointer leaves a window which has
a custom pointer icon, the pointer icon is not updated
upon re-entry.

Bug: 33824962
Test: manual
Change-Id: I3e40413117b8aa2a1bde47394ef9318a03a7e135

core/java/android/view/ViewRootImpl.java

@@ -4552,8 +4552,8 @@ public final class ViewRootImpl implements ViewParent,
 
         if (mPointerIconType != pointerType) {
             mPointerIconType = pointerType;
+            mCustomPointerIcon = null;
             if (mPointerIconType != PointerIcon.TYPE_CUSTOM) {
-                mCustomPointerIcon = null;
                 InputManager.getInstance().setPointerIconType(pointerType);
                 return true;
             }