Merge "Refactor WindowManagerServiceTests to use WindowStateBuilder" into main