Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-v2-dev am: 8e92b41238 am: b6fb28c041

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

Change-Id: I3bde1c72a0efe3cdc9f8ed573d362a076a88d810