Merge "wm tracing: simplify WindowManagerService mocking" into main