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

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



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