Merge "GnssLocationProvider metrics race condition fix"