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

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

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