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

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



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