Merge "No embed activity when Task is in PIP" into tm-dev am: a6b968f8 am: 8ebb15f5

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



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