Merge "Redirect shelf height requests into keep clear area registration" into udc-qpr-dev am: c24e6e0198 am: 1d727e732f

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

Change-Id: I051a70e8ed3fe8a06aab55b805955c6b687fe06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

@@ -939,6 +939,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb
      * Sets both shelf visibility and its height.
      */
     private void setShelfHeight(boolean visible, int height) {
+        if (mEnablePipKeepClearAlgorithm) {
+            // turn this into Launcher keep clear area registration instead
+            setLauncherKeepClearAreaHeight(visible, height);
+            return;
+        }
         if (!mIsKeyguardShowingOrAnimating) {
             setShelfHeightLocked(visible, height);
         }