Merge "Reset leash and content overlay if auto-enter-pip is aborted" into sc-dev am: d8bc2081

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

Change-Id: I9aa6f1e29899c70d8be908c9873463bfaf15a77d