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

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



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