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