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

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

Change-Id: I3a45028bb5e7cf361cd854e38e5f558b36fa0313