Check if WindowInfosListener is present during remove

This reverts commit 4854af5fa5c713ddfefad8770b3cb9e7ae0a494f.

Bug: 263311858
Test: presubmits
Change-Id: I1e53499745117fce80435fdf40e66efc55147bf9
1 file changed