Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an...

Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111c am: f07e3f28 am: b52340e2

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



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