Merge "LocationManager cleanups to make CTS tests easier"