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

Merge "Check if WindowInfosListener is present during remove" into udc-dev am: 2c1f96e0 am: 607b905c

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



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