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: 11c9c464

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

Change-Id: I1d24fccc1ed075849f7c7eaa852026e042876ac2