Merge "Only move Task to PiP if there is only one non-finishing activity" into...

Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-qpr-dev am: 4c61bbfe

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



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