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: bfef984d am: 226caa8e

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



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