[automerger skipped] Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-dev am: 99b30edb9e am: a18388d5a7 -s ours
am skip reason: Merged-In I9c68e3932940b7932db5f1dd4045170e66aa2dba with SHA-1 94fa8d09e9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17743156
Change-Id: I4c03cf6936fa15e5eedea328c60723a4aa42fb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: