[automerger skipped] Merge "Only move Task to PiP if there is only one...

[automerger skipped] Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-dev am: 99b30edb am: a11693c7 -s ours

am skip reason: Merged-In I9c68e3932940b7932db5f1dd4045170e66aa2dba with SHA-1 94fa8d09 is already in history

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



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