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

Merge "Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e am: e1a0bf36" into tm-d1-dev-plus-aosp am: 14abfb27 am: b0960a99

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



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