am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" automerge: fd7819d

automerge: 424924a

* commit '424924afc17c807a8059a55a522c976f64973c5d':
  Prevent wrong system ui visibility callback after the user swipe

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -6090,6 +6090,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         if (denyTransientStatus || denyTransientNav) {
             // clear the clearable flags instead
             clearClearableFlagsLw();
+            vis &= ~View.SYSTEM_UI_CLEARABLE_FLAGS;
         }
 
         vis = mStatusBarController.updateVisibilityLw(transientStatusBarAllowed, oldVis, vis);