[automerger skipped] Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74 -s ours am: 99cbbc60b5 -s ours

am skip reason: Merged-In I2057467d5146be6edc382d3745a1e5269cd76a6b with SHA-1 c5d50f710a is already in history

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

Change-Id: Ic11fec2b2df26614cc4bfb3e9eb2bce61182d352