Merge "Fix error prone build of WM tests in FrameworksServicesTests"