Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757c am: 1b4735ab

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



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