Merge "Fix flakiness in CarModeInCallServiceTest."