Merge "Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev...

Merge "Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e am: de2d849a am: 4c50bc79" into tm-qpr-dev-plus-aosp am: 2df49c1a

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



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