Merge "Prevent deadlock when releasing VirtualDisplays" into tm-dev am: 1187757cf2 am: f8f04fa5a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658628 Change-Id: I2f2e8d901a31119ed63126e31075f9eb4eff7cb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: