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: 6f74325f am: b5bd9f7c

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



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