[automerger skipped] Merge "Make onVirtualDisplayRemoved callback idempotent."...

[automerger skipped] Merge "Make onVirtualDisplayRemoved callback idempotent." into udc-qpr-dev am: 88c87429 am: 40645398 -s ours

am skip reason: Merged-In I151eafc1f4c2ea3fb5c8ed966965fe7efbd9cc56 with SHA-1 502f5729 is already in history

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



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