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

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



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