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

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

Change-Id: I655885019deeef38e5ae01456cae036bc41b4666