Merge "Fix the activity windowingmode error of exiting pip" into main am: b90b46a5 am: e9b753a0

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



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