Merge "Revert "Don't copy null surface control and remove lingering references...

Merge "Revert "Don't copy null surface control and remove lingering references to leashes"" into tm-qpr-dev am: d69caeee am: 874141e6

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



Change-Id: I58342bcdc0507bb68c31c9d0059f4758a1c2f114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>