Merge "Revert^2 Do not enter pip during transient launch" into udc-qpr-dev am: 05b23f1e

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



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