Merge "Make onVirtualDisplayRemoved callback idempotent." into udc-qpr-dev am: 88c874299e

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

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