Merge "Revert "Check if WindowInfosListener is present during remove"" into...

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

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



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