Merge "Refactor virtual display creation and cleanup" into udc-dev am: 940e020a am: 791f4338

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



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