Merge "Clean up interface between LocationManagerService and the location providers:"