Merge "Use TYPE_ENTER_PIP_FROM_SPLIT only if the task is on split" into...

Merge "Use TYPE_ENTER_PIP_FROM_SPLIT only if the task is on split" into udc-dev am: 9d2d6d1f am: d59b1caa am: d2b6b4a5

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



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