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

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

Change-Id: Icf6a5d0de69f171470c1889e84145a95bbb6c959