Merge "Remove Activity if it enters PiP without window" into rvc-dev am:...

Merge "Remove Activity if it enters PiP without window" into rvc-dev am: 81224e6f am: d6a9b807 am: 6255caf9 am: d1283341

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



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