Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev