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

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



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