Merge "ServiceStateProvider: sanitize location info if caller has no permission"