Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111cc4 am: f07e3f2801

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

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