Merge "Revert "Check if WindowInfosListener is present during remove"" into udc-dev am: d3fbc898

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



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