Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e am: e81140f0

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



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