Update component matcher to support matching WindowContainers instead of just WindowStates Required for FaaS since we will have information about the WindowContainer that contains the WindowState rather than the WindowState itself Bug: 265791451 Test: atest FlickerLibTest Change-Id: If8b3a78e3c702ae867237f35118ebe336ca073df