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

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

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



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