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