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: 9693a783 am: 8f8a1212

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



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