Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" into lmp-dev