Merge "Fix accessibility regression." into rvc-dev am: e2714d739a am: d743fbf0b1

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

Change-Id: Idbe2a6bbec9c21f21ac1e241a4c73aa4a1d2a609

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

@@ -688,11 +688,11 @@ public class PipTouchHandler {
                 break;
             }
             case MotionEvent.ACTION_HOVER_EXIT: {
-                mHideMenuAfterShown = true;
                 // If Touch Exploration is enabled, some a11y services (e.g. Talkback) is probably
                 // on and changing MotionEvents into HoverEvents.
                 // Let's not enable menu show/hide for a11y services.
                 if (!mAccessibilityManager.isTouchExplorationEnabled()) {
+                    mHideMenuAfterShown = true;
                     mMenuController.hideMenu();
                 }
                 if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {