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

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

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

@@ -5797,6 +5797,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);