Merge "Cleanup on aborting auto-enter-pip" into udc-dev am: 9ad05b2f am:...

Merge "Cleanup on aborting auto-enter-pip" into udc-dev am: 9ad05b2f am: 17e8f2e6 am: 06e38fef

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



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