Merge "Check if WindowInfosListener is present during remove" into udc-dev am: 2c1f96e0

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



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