Merge "Reset leash and content overlay if auto-enter-pip is aborted" into...

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

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

Change-Id: I238e1e125c84a6c372b54c06c5e46c006bce4147