Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941832

Change-Id: Ia02220391d940a13ebd2c76fd3474a344951fa40