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

Merge "Don't copy null surface control and remove lingering references to leashes" into tm-qpr-dev am: 7411c42f am: 9965ae15

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



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