Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd am: eb38d231bc am: 71e43ca1b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032 Change-Id: I63e00b6ff0cc37f9360444cf3b049fb7fd7d5699 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: