Merge "Fix WindowInfosListener_test" into udc-dev am: 763d67f3 am: f0a10912

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



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