Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"