Merge "[wm] Explicitly release surfacecontrol in mirrorDisplay" into udc-dev am: d6181d7c

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



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