Merge "Fix FrameworksServicesTests:PrioritySchedulingTest."