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

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



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