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

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



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