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: If281ea4c031906e7b98348072e0a80def0a97165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>