Merge "Remove mTargetViewContainer safely" into sc-v2-dev am: 77f8728004

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

Change-Id: Ia4770263005a72491e98ed9043bce59f25b90e93

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

@@ -122,7 +122,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
 
         if (mTargetViewContainer != null) {
             // init can be called multiple times, remove the old one from view hierarchy first.
-            mWindowManager.removeViewImmediate(mTargetViewContainer);
+            cleanUpDismissTarget();
         }
 
         mTargetView = new DismissCircleView(mContext);